fix(Accordion): replace internal animation with HeightAnimation compo…

…nent (#1619)
dnbexperience · Oct 10, 2022 · 2cb2d48 · 2cb2d48
1 parent a961feb
commit 2cb2d48
Show file tree

Hide file tree

Showing 10 changed files with 274 additions and 249 deletions.
diff --git a/...ages/dnb-design-system-portal/src/docs/uilib/components/accordion/properties.md b/...ages/dnb-design-system-portal/src/docs/uilib/components/accordion/properties.md
@@ -29,6 +29,7 @@ These properties can send along with the `Accordion.Provider` or `Accordion.Grou
 | `heading_level`                             | _(optional)_ if `heading` is set to `true`, you can provide a numeric value to define a different heading level. Defaults to `2`.                                                                                                            |
 | `disabled`                                  | _(optional)_ if set to `true`, the accordion button will be disabled (dimmed).                                                                                                                                                               |
 | `skeleton`                                  | _(optional)_ if set to `true`, an overlaying skeleton with animation will be shown.                                                                                                                                                          |
+| `contentRef`                                | _(optional)_ send along a custom React Ref for `.dnb-accordion__content`.                                                                                                                                                                    |
 | [Space](/uilib/components/space/properties) | _(optional)_ spacing properties like `top` or `bottom` are supported.                                                                                                                                                                        |
 
 | Accordion.Provider and Accordion.Group Properties | Description                                                               |

diff --git a/packages/dnb-eufemia/src/components/accordion/Accordion.js b/packages/dnb-eufemia/src/components/accordion/Accordion.js
@@ -95,7 +95,6 @@ export default class Accordion extends React.PureComponent {
           ? isTrue(props.expanded)
           : isTrue(context?.expanded),
       group: props.group || context?.group,
-      no_animation: isTrue(props.no_animation || context?.no_animation),
       _listenForPropChanges: false, // make sure to not run DerivedState
     }
 
@@ -240,7 +239,6 @@ export default class Accordion extends React.PureComponent {
         {(globalContext) => (
           <AccordionContext.Consumer>
             {(nestedContext) => {
-              const { no_animation } = this.state
               let { expanded } = this.state
 
               // use only the props from context, who are available here anyway
@@ -271,7 +269,7 @@ export default class Accordion extends React.PureComponent {
                 remember_state,
                 disabled,
                 skeleton,
-                no_animation: _no_animation, // eslint-disable-line
+                no_animation,
                 expanded_ssr: _expanded_ssr, // eslint-disable-line
                 children,
 
@@ -289,6 +287,7 @@ export default class Accordion extends React.PureComponent {
                 on_state_update, // eslint-disable-line
                 custom_method, // eslint-disable-line
                 custom_element, // eslint-disable-line
+                contentRef, // eslint-disable-line
 
                 ...rest
               } = props
@@ -300,7 +299,6 @@ export default class Accordion extends React.PureComponent {
                 className: classnames(
                   'dnb-accordion',
                   expanded && 'dnb-accordion--expanded',
-                  no_animation && 'dnb-accordion--no-animation',
                   variant && `dnb-accordion__variant--${variant}`,
                   isTrue(prerender) && 'dnb-accordion--prerender',
                   createSpacingClasses(props),
@@ -336,6 +334,7 @@ export default class Accordion extends React.PureComponent {
                 remember_state: isTrue(remember_state),
                 disabled: isTrue(disabled),
                 skeleton: isTrue(skeleton),
+                no_animation: isTrue(no_animation),
                 callOnChange: this.callOnChangeHandler,
               }