From 241b27b7c6b17f7edcedc07967a5bd418f485cd1 Mon Sep 17 00:00:00 2001 From: AhmedSarkawt <40734891+AhmedSarkawt@users.noreply.github.com> Date: Mon, 30 Nov 2020 10:53:01 +0300 Subject: [PATCH 1/3] Update Collapse.tsx Having an unset option to provide easier customization to the collapse --- src/Collapse.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Collapse.tsx b/src/Collapse.tsx index 4e2b9ee..aad0a69 100644 --- a/src/Collapse.tsx +++ b/src/Collapse.tsx @@ -34,7 +34,9 @@ class Collapse extends React.Component { const { activeKey, defaultActiveKey } = props; let currentActiveKey = defaultActiveKey; if ('activeKey' in props) { - currentActiveKey = activeKey; + activeKey === 'unset' + ? currentActiveKey = defaultActiveKey + : currentActiveKey = activeKey; } this.state = { From 06c92a32115457cfdcec6fb05c357f782f6939b7 Mon Sep 17 00:00:00 2001 From: AhmedSarkawt <40734891+AhmedSarkawt@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:01:43 +0300 Subject: [PATCH 2/3] Update Collapse.tsx Update the ternary operator to if statement. --- src/Collapse.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Collapse.tsx b/src/Collapse.tsx index aad0a69..6888689 100644 --- a/src/Collapse.tsx +++ b/src/Collapse.tsx @@ -34,9 +34,11 @@ class Collapse extends React.Component { const { activeKey, defaultActiveKey } = props; let currentActiveKey = defaultActiveKey; if ('activeKey' in props) { - activeKey === 'unset' - ? currentActiveKey = defaultActiveKey - : currentActiveKey = activeKey; + if (activeKey === 'unset) { + currentActiveKey = defaultActiveKey; + } else { + currentActiveKey = activeKey; + } } this.state = { From 94b61956692914cc3edb26d89d9fede5325fcada Mon Sep 17 00:00:00 2001 From: AhmedSarkawt <40734891+AhmedSarkawt@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:09:19 +0300 Subject: [PATCH 3/3] Fix the if condition --- src/Collapse.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Collapse.tsx b/src/Collapse.tsx index 6888689..79545f4 100644 --- a/src/Collapse.tsx +++ b/src/Collapse.tsx @@ -34,13 +34,12 @@ class Collapse extends React.Component { const { activeKey, defaultActiveKey } = props; let currentActiveKey = defaultActiveKey; if ('activeKey' in props) { - if (activeKey === 'unset) { + if (activeKey === 'unset') { currentActiveKey = defaultActiveKey; - } else { + } else { currentActiveKey = activeKey; } } - this.state = { activeKey: getActiveKeysArray(currentActiveKey), };