Skip to content

#163 Make collapse time local #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2025
Merged

#163 Make collapse time local #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/CollectionNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,8 @@ export const CollectionNode: React.FC<CollectionNodeProps> = (props) => {

const startCollapsed = collapseFilter(incomingNodeData)

const { contentRef, isAnimating, maxHeight, collapsed, animateCollapse } = useCollapseTransition(
data,
collapseAnimationTime,
startCollapsed,
mainContainerRef
)
const { contentRef, isAnimating, maxHeight, collapsed, animateCollapse, cssTransitionValue } =
useCollapseTransition(data, collapseAnimationTime, startCollapsed, mainContainerRef)

const {
pathString,
Expand Down Expand Up @@ -462,7 +458,7 @@ export const CollectionNode: React.FC<CollectionNodeProps> = (props) => {
<div className="jer-collection-name">
<div
className={`jer-collapse-icon jer-accordion-icon${collapsed ? ' jer-rotate-90' : ''}`}
style={{ zIndex: 11 + nodeData.level * 2 }}
style={{ zIndex: 11 + nodeData.level * 2, transition: cssTransitionValue }}
onClick={(e) => handleCollapse(e)}
>
<Icon name="chevron" rotate={collapsed} nodeData={nodeData} />
Expand All @@ -480,7 +476,7 @@ export const CollectionNode: React.FC<CollectionNodeProps> = (props) => {
{!isEditing && showCount && (
<div
className={`jer-collection-item-count${showCount ? ' jer-visible' : ' jer-hidden'}`}
style={getStyles('itemCount', nodeData)}
style={{ ...getStyles('itemCount', nodeData), transition: cssTransitionValue }}
>
{size === 1
? translate('ITEM_SINGLE', { ...nodeData, size: 1 }, 1)
Expand All @@ -489,7 +485,7 @@ export const CollectionNode: React.FC<CollectionNodeProps> = (props) => {
)}
<div
className={`jer-brackets${isCollapsed ? ' jer-visible' : ' jer-hidden'}`}
style={getStyles('bracket', nodeData)}
style={{ ...getStyles('bracket', nodeData), transition: cssTransitionValue }}
>
{brackets.close}
</div>
Expand All @@ -510,6 +506,7 @@ export const CollectionNode: React.FC<CollectionNodeProps> = (props) => {
// Prevent collapse if this node or any children are being edited
maxHeight: childrenEditing ? undefined : maxHeight,
...getStyles('collectionInner', nodeData),
transition: cssTransitionValue,
}}
ref={contentRef}
>
Expand Down
7 changes: 0 additions & 7 deletions src/JsonEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,8 @@ export const JsonEditor: React.FC<JsonEditorProps> = (props) => {
setDocRoot(root)
}, [])

const { collapseAnimationTime = 300 } = props

if (!docRoot) return null

const transitionTime = getComputedStyle(docRoot).getPropertyValue('--jer-expand-transition-time')
if (parseFloat(transitionTime) * 1000 !== collapseAnimationTime) {
docRoot.style.setProperty('--jer-expand-transition-time', `${collapseAnimationTime / 1000}s`)
}

return (
<ThemeProvider theme={props.theme ?? defaultTheme} icons={props.icons} docRoot={docRoot}>
<TreeStateProvider>
Expand Down
3 changes: 3 additions & 0 deletions src/hooks/useCollapseTransition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export const useCollapseTransition = (
const prevHeight = useRef<string | number>(0)
const timerId = useRef<number>()

const cssTransitionValue = `${collapseAnimationTime / 1000}s`

// Method to change the collapse state and manage the animated transition
const animateCollapse = (collapse: boolean) => {
if (collapsed === collapse) return
Expand Down Expand Up @@ -98,6 +100,7 @@ export const useCollapseTransition = (
animateCollapse,
maxHeight,
collapsed,
cssTransitionValue,
}
}

Expand Down
8 changes: 1 addition & 7 deletions src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@
--jer-select-arrow: #777;
--jer-form-border: 1px solid #ededf0;
--jer-form-border-focus: 1px solid #e2e2e2;
--jer-expand-transition-time: 0.3s;
--jer-highlight-color: #b3d8ff;
}

.jer-visible {
opacity: 1;
transition: var(--jer-expand-transition-time);
}

.jer-hidden {
opacity: 0;
transition: var(--jer-expand-transition-time);
}

/* Select styled as per:
Expand Down Expand Up @@ -157,7 +154,6 @@ select:focus + .focus {

.jer-collection-inner {
position: relative;
transition: var(--jer-expand-transition-time);
}

.jer-collection-text-edit {
Expand Down Expand Up @@ -339,7 +335,7 @@ select:focus + .focus {

.jer-copy-pulse {
position: relative;
transition: transform var(--jer-expand-transition-time);
transition: 0.3s;
}

.jer-copy-pulse:hover {
Expand Down Expand Up @@ -378,12 +374,10 @@ select:focus + .focus {

.jer-rotate-90 {
transform: rotate(-90deg);
transition: transform var(--jer-expand-transition-time);
}

.jer-accordion-icon {
/* font-size: '2em'; */
transition: transform var(--jer-expand-transition-time);
}

.jer-icon:hover {
Expand Down