fix: revert v10 merge

humphreyja · Feb 17, 2023 · 3392ce9 · 3392ce9
1 parent bcb02da
commit 3392ce9
Show file tree

Hide file tree

Showing 55 changed files with 164 additions and 226 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -2,9 +2,9 @@ name: Test Coverage
 
 on:
   push:
-    branches: [ master, bootstrap5, v10 ]
+    branches: [ master, bootstrap5 ]
   pull_request:
-    branches: [ master, bootstrap5, v10 ]
+    branches: [ master, bootstrap5 ]
 
 jobs:
 

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master, release-*, v10 ]
+    branches: [ master, release-* ]
   pull_request:
-    branches: [ master, v10 ]
+    branches: [ master ]
 
 jobs:
   build:

diff --git a/src/Accordion.js b/src/Accordion.js
@@ -29,15 +29,15 @@ const defaultProps = {
   tag: 'div',
 };
 
-const Accordion = React.forwardRef((props, ref) => {
+function Accordion(props) {
   const {
     flush,
     open,
     toggle,
     className,
     cssModule,
     tag: Tag,
-    innerRef = ref,
+    innerRef,
     ...attributes
   } = props;
   const classes = mapToCssModules(
@@ -57,7 +57,7 @@ const Accordion = React.forwardRef((props, ref) => {
       <Tag {...attributes} className={classes} ref={innerRef} />
     </AccordionContext.Provider>
   );
-})
+}
 
 Accordion.propTypes = propTypes;
 Accordion.defaultProps = defaultProps;

diff --git a/src/AccordionBody.js b/src/AccordionBody.js
@@ -27,12 +27,12 @@ const defaultProps = {
   tag: 'div',
 };
 
-const AccordionBody = React.forwardRef((props, ref) => {
+function AccordionBody(props) {
   const {
     className,
     cssModule,
     tag: Tag,
-    innerRef = ref,
+    innerRef,
     children,
     accordionId,
     ...attributes
@@ -57,7 +57,7 @@ const AccordionBody = React.forwardRef((props, ref) => {
       <Tag className="accordion-body">{children}</Tag>
     </Collapse>
   );
-})
+}
 
 AccordionBody.propTypes = propTypes;
 AccordionBody.defaultProps = defaultProps;

diff --git a/src/AccordionHeader.js b/src/AccordionHeader.js
@@ -25,12 +25,12 @@ const defaultProps = {
   tag: 'h2',
 };
 
-const AccordionHeader = React.forwardRef((props, ref) => {
+function AccordionHeader(props) {
   const {
     className,
     cssModule,
     tag: Tag,
-    innerRef = ref,
+    innerRef,
     children,
     targetId,
     ...attributes
@@ -62,7 +62,7 @@ const AccordionHeader = React.forwardRef((props, ref) => {
       </button>
     </Tag>
   );
-})
+}
 
 AccordionHeader.propTypes = propTypes;
 AccordionHeader.defaultProps = defaultProps;

diff --git a/src/AccordionItem.js b/src/AccordionItem.js
@@ -22,15 +22,15 @@ const defaultProps = {
   tag: 'div',
 };
 
-const AccordionItem = React.forwardRef((props, ref) => {
-  const { className, cssModule, tag: Tag, innerRef = ref, ...attributes } = props;
+function AccordionItem(props) {
+  const { className, cssModule, tag: Tag, innerRef, ...attributes } = props;
   const classes = mapToCssModules(
     classNames(className, 'accordion-item'),
     cssModule,
   );
 
   return <Tag {...attributes} className={classes} ref={innerRef} />;
-})
+}
 
 AccordionItem.propTypes = propTypes;
 AccordionItem.defaultProps = defaultProps;

diff --git a/src/Alert.js b/src/Alert.js
@@ -46,7 +46,7 @@ const defaultProps = {
   },
 };
 
-const Alert = React.forwardRef((props, ref) => {
+function Alert(props) {
   const {
     className,
     closeClassName,
@@ -59,7 +59,7 @@ const Alert = React.forwardRef((props, ref) => {
     children,
     transition,
     fade,
-    innerRef = ref,
+    innerRef,
     ...attributes
   } = props;
 
@@ -103,7 +103,7 @@ const Alert = React.forwardRef((props, ref) => {
       {children}
     </Fade>
   );
-});
+}
 
 Alert.propTypes = propTypes;
 Alert.defaultProps = defaultProps;

diff --git a/src/Badge.js b/src/Badge.js
@@ -29,12 +29,12 @@ const defaultProps = {
   tag: 'span',
 };
 
-const Badge = React.forwardRef((props, ref) => {
+function Badge(props) {
   let {
     className,
     cssModule,
     color,
-    innerRef = ref,
+    innerRef,
     pill,
     tag: Tag,
     ...attributes
@@ -55,7 +55,7 @@ const Badge = React.forwardRef((props, ref) => {
   }
 
   return <Tag {...attributes} className={classes} ref={innerRef} />;
-});
+}
 
 Badge.propTypes = propTypes;
 Badge.defaultProps = defaultProps;

diff --git a/src/Button.js b/src/Button.js
@@ -42,7 +42,7 @@ const defaultProps = {
   tag: 'button',
 };
 
-const Button = React.forwardRef((props, ref) => {
+function Button(props) {
   const onClick = useCallback(
     (e) => {
       if (props.disabled) {
@@ -68,7 +68,7 @@ const Button = React.forwardRef((props, ref) => {
     outline,
     size,
     tag: Tag,
-    innerRef = ref,
+    innerRef,
     ...attributes
   } = props;
 
@@ -104,7 +104,7 @@ const Button = React.forwardRef((props, ref) => {
       aria-label={ariaLabel}
     />
   );
-});
+}
 
 Button.propTypes = propTypes;
 Button.defaultProps = defaultProps;

diff --git a/src/Card.js b/src/Card.js
@@ -58,4 +58,4 @@ function Card(props) {
 Card.propTypes = propTypes;
 Card.defaultProps = defaultProps;
 
-export default React.forwardRef((props, ref) => <Card innerRef={ref} {...props} />);
+export default Card;
diff --git a/src/CardBody.js b/src/CardBody.js
@@ -21,15 +21,15 @@ const defaultProps = {
   tag: 'div',
 };
 
-const CardBody = React.forwardRef((props, ref) => {
-  const { className, cssModule, innerRef = ref, tag: Tag, ...attributes } = props;
+function CardBody(props) {
+  const { className, cssModule, innerRef, tag: Tag, ...attributes } = props;
   const classes = mapToCssModules(
     classNames(className, 'card-body'),
     cssModule,
   );
 
   return <Tag {...attributes} className={classes} ref={innerRef} />;
-});
+}
 
 CardBody.propTypes = propTypes;
 CardBody.defaultProps = defaultProps;

diff --git a/src/CardLink.js b/src/CardLink.js
@@ -18,15 +18,15 @@ const defaultProps = {
   tag: 'a',
 };
 
-const CardLink = React.forwardRef((props, ref) => {
-  const { className, cssModule, tag: Tag, innerRef = ref, ...attributes } = props;
+function CardLink(props) {
+  const { className, cssModule, tag: Tag, innerRef, ...attributes } = props;
   const classes = mapToCssModules(
     classNames(className, 'card-link'),
     cssModule,
   );
 
   return <Tag {...attributes} ref={innerRef} className={classes} />;
-})
+}
 
 CardLink.propTypes = propTypes;
 CardLink.defaultProps = defaultProps;

diff --git a/src/CloseButton.js b/src/CloseButton.js
@@ -25,8 +25,8 @@ const defaultProps = {
   'aria-label': 'close',
 };
 
-const CloseButton = React.forwardRef((props, ref) => {
-  const { className, cssModule, variant, innerRef = ref, ...attributes } = props;
+function CloseButton(props) {
+  const { className, cssModule, variant, innerRef, ...attributes } = props;
 
   const classes = mapToCssModules(
     classNames(className, 'btn-close', variant && `btn-close-${variant}`),
@@ -35,7 +35,7 @@ const CloseButton = React.forwardRef((props, ref) => {
   return (
     <button ref={innerRef} type="button" className={classes} {...attributes} />
   );
-});
+}
 
 CloseButton.propTypes = propTypes;
 CloseButton.defaultProps = defaultProps;

diff --git a/src/Collapse.js b/src/Collapse.js
@@ -172,4 +172,4 @@ class Collapse extends Component {
 
 Collapse.propTypes = propTypes;
 Collapse.defaultProps = defaultProps;
-export default React.forwardRef((props, ref) => <Collapse innerRef={ref} {...props} />);
+export default Collapse;
diff --git a/src/Dropdown.js b/src/Dropdown.js
@@ -371,4 +371,4 @@ Dropdown.propTypes = propTypes;
 Dropdown.defaultProps = defaultProps;
 Dropdown.contextType = InputGroupContext;
 
-export default React.forwardRef((props, ref) => <Dropdown innerRef={ref} {...props} />);
+export default Dropdown;
diff --git a/src/DropdownToggle.js b/src/DropdownToggle.js
@@ -143,4 +143,4 @@ DropdownToggle.propTypes = propTypes;
 DropdownToggle.defaultProps = defaultProps;
 DropdownToggle.contextType = DropdownContext;
 
-export default React.forwardRef((props, ref) => <DropdownToggle innerRef={ref} {...props} />);
+export default DropdownToggle;
diff --git a/src/Fade.js b/src/Fade.js
@@ -41,15 +41,15 @@ const defaultProps = {
   in: true,
 };
 
-const Fade = React.forwardRef((props, ref) => {
+function Fade(props) {
   const {
     tag: Tag,
     baseClass,
     baseClassActive,
     className,
     cssModule,
     children,
-    innerRef = ref,
+    innerRef,
     ...otherProps
   } = props;
 
@@ -72,7 +72,7 @@ const Fade = React.forwardRef((props, ref) => {
       }}
     </Transition>
   );
-});
+}
 
 Fade.propTypes = propTypes;
 Fade.defaultProps = defaultProps;

diff --git a/src/Form.js b/src/Form.js
@@ -17,8 +17,6 @@ const propTypes = {
 const defaultProps = {
   tag: 'form',
 };
-
-// TODO: Simple conversion of functional component "good-first-task"
 class Form extends Component {
   constructor(props) {
     super(props);
@@ -56,4 +54,4 @@ class Form extends Component {
 Form.propTypes = propTypes;
 Form.defaultProps = defaultProps;
 
-export default React.forwardRef((props, ref) => <Form innerRef={ref} {...props} />);
+export default Form;
diff --git a/src/Input.js b/src/Input.js
@@ -144,4 +144,4 @@ class Input extends React.Component {
 Input.propTypes = propTypes;
 Input.defaultProps = defaultProps;
 
-export default React.forwardRef((props, ref) => <Input innerRef={ref} {...props} />);
+export default Input;
diff --git a/src/Modal.js b/src/Modal.js
@@ -574,4 +574,4 @@ Modal.defaultProps = defaultProps;
 Modal.openCount = 0;
 Modal.originalBodyOverflow = null;
 
-export default React.forwardRef((props, ref) => <Modal innerRef={ref} {...props} />);
+export default Modal;
diff --git a/src/NavLink.js b/src/NavLink.js
@@ -82,4 +82,4 @@ class NavLink extends React.Component {
 NavLink.propTypes = propTypes;
 NavLink.defaultProps = defaultProps;
 
-export default React.forwardRef((props, ref) => <NavLink innerRef={ref} {...props} />);
+export default NavLink;
diff --git a/src/Offcanvas.js b/src/Offcanvas.js
@@ -468,4 +468,4 @@ Offcanvas.propTypes = propTypes;
 Offcanvas.defaultProps = defaultProps;
 Offcanvas.openCount = 0;
 
-export default React.forwardRef((props, ref) => <Offcanvas innerRef={ref} {...props} />);
+export default Offcanvas;