From d50ee329f1750c39754d044e34a077d7e74dbfc3 Mon Sep 17 00:00:00 2001 From: Carmen Tang Date: Wed, 18 Dec 2019 13:23:36 -0800 Subject: [PATCH 1/3] change accordion timing --- src/elements/Accordion/Accordion.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/elements/Accordion/Accordion.js b/src/elements/Accordion/Accordion.js index ec87a1a..ea991c7 100644 --- a/src/elements/Accordion/Accordion.js +++ b/src/elements/Accordion/Accordion.js @@ -90,8 +90,8 @@ class Accordion extends Component { toggle: 'hide' }, () => { window.requestAnimationFrame(() => { - const transitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 5000 - ? 5000 + const transitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 2000 + ? 1000 : Math.max(this.accordionContent.current.clientHeight, 300); // Set fixed height (based on height of content) and set transition-duration for .ui-accordion-content-wrapper. From 27934e5bb12851581bd8c789ccbf8bcdbbeb2fbb Mon Sep 17 00:00:00 2001 From: Carmen Tang Date: Wed, 18 Dec 2019 13:31:18 -0800 Subject: [PATCH 2/3] 2 --- src/elements/Accordion/Accordion.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/elements/Accordion/Accordion.js b/src/elements/Accordion/Accordion.js index ea991c7..d0a8849 100644 --- a/src/elements/Accordion/Accordion.js +++ b/src/elements/Accordion/Accordion.js @@ -122,13 +122,17 @@ class Accordion extends Component { window.requestAnimationFrame(() => { this.accordionContent.current.parentNode.style.height = 0; + const closeTransitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 2000 + ? 1000 + : Math.max(this.accordionContent.current.clientHeight, 300); + // Remove content from DOM after animation is complete setTimeout(() => { this.setState({ showContent: false }); this.disableToggle = false; - }, this.accordionContent.current.clientHeight); + }, closeTransitionDuration); }); } } From fa0bdbe8920d3d43c0608651bf84f82a809f5d0e Mon Sep 17 00:00:00 2001 From: Carmen Tang Date: Thu, 19 Dec 2019 09:30:46 -0800 Subject: [PATCH 3/3] e --- src/elements/Accordion/Accordion.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/elements/Accordion/Accordion.js b/src/elements/Accordion/Accordion.js index d0a8849..680eac7 100644 --- a/src/elements/Accordion/Accordion.js +++ b/src/elements/Accordion/Accordion.js @@ -90,8 +90,8 @@ class Accordion extends Component { toggle: 'hide' }, () => { window.requestAnimationFrame(() => { - const transitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 2000 - ? 1000 + const transitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 1500 + ? 1500 : Math.max(this.accordionContent.current.clientHeight, 300); // Set fixed height (based on height of content) and set transition-duration for .ui-accordion-content-wrapper. @@ -122,8 +122,8 @@ class Accordion extends Component { window.requestAnimationFrame(() => { this.accordionContent.current.parentNode.style.height = 0; - const closeTransitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 2000 - ? 1000 + const closeTransitionDuration = Math.max(this.accordionContent.current.clientHeight, 300) > 1500 + ? 1500 : Math.max(this.accordionContent.current.clientHeight, 300); // Remove content from DOM after animation is complete