Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Support expand all when alt+click on navigator chevron (#2155)

Bogdan Chadkinbd3e912d8356
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index 089dc652d3..8ee11fdd05 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -241,7 +241,7 @@ export type TreeItemRenderProps<Data extends { id: string }> = {
isAlwaysExpanded: boolean;
shouldRenderExpandButton: boolean;
isExpanded: boolean;
- onToggle: () => void;
+ onToggle: (all: boolean) => void;
};
export const TreeItemBody = <Data extends { id: string }>({
@@ -351,7 +351,7 @@ export const TreeItemBody = <Data extends { id: string }>({
style={{ left: (level - 1) * INDENT + ITEM_PADDING_LEFT }}
// We don't want this trigger to be focusable
tabIndex={-1}
- onClick={onToggle}
+ onClick={(event) => onToggle(event.altKey)}
>
{isExpanded ? <ChevronFilledDownIcon /> : <ChevronFilledRightIcon />}
</CollapsibleTrigger>
@@ -398,7 +398,11 @@ export type TreeNodeProps<Data extends { id: ItemId }> = {
renderItem: (props: TreeItemRenderProps<Data>) => React.ReactNode;
getIsExpanded: (itemSelector: ItemSelector) => boolean;
- setIsExpanded?: (itemSelector: ItemSelector, expanded: boolean) => void;
+ setIsExpanded?: (
+ itemSelector: ItemSelector,
+ value: boolean,
+ all?: boolean
+ ) => void;
selectedItemSelector?: ItemSelector;
dropTargetItemSelector?: ItemSelector;
@@ -460,7 +464,13 @@ export const TreeNode = <Data extends { id: string }>({
isAlwaysExpanded,
shouldRenderExpandButton,
isExpanded,
- onToggle: () => setIsExpanded?.(itemSelector, isExpanded === false),
+ onToggle: (all) => {
+ setIsExpanded?.(
+ itemSelector,
+ getIsExpanded(itemSelector) === false,
+ all
+ );
+ },
})}
{isExpandable &&
isExpanded &&
diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsx
index 117800f145..87bb7ae4e8 100644
--- a/packages/design-system/src/components/tree/tree.tsx
+++ b/packages/design-system/src/components/tree/tree.tsx
@@ -80,6 +80,7 @@ export const Tree = <Data extends { id: string }>({
}: TreeProps<Data>) => {
const { getIsExpanded, setIsExpanded } = useExpandState({
selectedItemSelector,
+ getItemChildren,
});
const rootRef = useRef<HTMLElement | null>(null);
@@ -297,8 +298,8 @@ export const Tree = <Data extends { id: string }>({
selectedItemSelector={selectedItemSelector}
itemData={root}
getIsExpanded={getIsExpanded}
- setIsExpanded={(itemSelector, isExpanded) => {
- setIsExpanded(itemSelector, isExpanded);
+ setIsExpanded={(itemSelector, value, all) => {
+ setIsExpanded(itemSelector, value, all);
dropHandlers.handleDomMutation();
}}
dropTargetItemSelector={shiftedDropTarget?.itemSelector}
@@ -333,7 +334,11 @@ const useKeyboardNavigation = <Data extends { id: string }>({
getItemChildren: (itemId: ItemId) => Data[];
isItemHidden: (itemId: ItemId) => boolean;
getIsExpanded: (itemSelector: ItemSelector) => boolean;
- setIsExpanded: (itemSelector: ItemSelector, isExpanded: boolean) => void;
+ setIsExpanded: (
+ itemSelector: ItemSelector,
+ value: boolean,
+ all?: boolean
+ ) => void;
onEsc: () => void;
editingItemId: ItemId | undefined;
}) => {
@@ -376,7 +381,10 @@ const useKeyboardNavigation = <Data extends { id: string }>({
setIsExpanded(selectedItemSelector, false);
}
if (event.key === " ") {
- setIsExpanded(selectedItemSelector, !getIsExpanded(selectedItemSelector));
+ setIsExpanded(
+ selectedItemSelector,
+ getIsExpanded(selectedItemSelector) === false
+ );
// prevent scrolling
event.preventDefault();
}
@@ -477,10 +485,12 @@ const useKeyboardNavigation = <Data extends { id: string }>({
};
};
-const useExpandState = ({
+const useExpandState = <Data extends { id: string }>({
selectedItemSelector,
+ getItemChildren,
}: {
selectedItemSelector: undefined | ItemSelector;
+ getItemChildren: (itemId: string) => Data[];
}) => {
const [record, setRecord] = useState<Record<string, boolean>>({});
@@ -528,10 +538,25 @@ const useExpandState = ({
);
const setIsExpanded = useCallback(
- (itemSelector: ItemSelector, expanded: boolean) => {
- setRecord((record) => ({ ...record, [itemSelector.join()]: expanded }));
+ (itemSelector: ItemSelector, value: boolean, all?: boolean) => {
+ setRecord((record) => {
+ if (all) {
+ const newRecord = { ...record };
+ const addChildren = (parentSelector: string[]) => {
+ for (const child of getItemChildren(parentSelector[0])) {
+ const itemSelector = [child.id, ...parentSelector];
+ newRecord[itemSelector.join()] = value;
+ addChildren(itemSelector);
+ }
+ };
+ newRecord[itemSelector.join()] = value;
+ addChildren(itemSelector);
+ return newRecord;
+ }
+ return { ...record, [itemSelector.join()]: value };
+ });
},
- []
+ [getItemChildren]
);
return { getIsExpanded, setIsExpanded };
diff --git a/packages/sdk-components-react-radix/src/accordion.tsx b/packages/sdk-components-react-radix/src/accordion.tsx
index 3d5f608dff..bf917d5646 100644
--- a/packages/sdk-components-react-radix/src/accordion.tsx
+++ b/packages/sdk-components-react-radix/src/accordion.tsx
@@ -57,23 +57,30 @@ export const AccordionContent: ForwardRefExoticComponent<
const namespace = "@webstudio-is/sdk-components-react-radix";
-// For each AccordionItem component within the selection,
+// For each AccordionContent component within the selection,
// we identify its closest parent Accordion component
// and update its open prop bound to variable.
export const hooksAccordion: Hook = {
onNavigatorSelect: (context, event) => {
for (const instance of event.instancePath) {
- if (instance.component === `${namespace}:AccordionItem`) {
+ if (instance.component === `${namespace}:AccordionContent`) {
const accordion = getClosestInstance(
event.instancePath,
instance,
`${namespace}:Accordion`
);
- const itemValue =
- context.getPropValue(instance.id, "value") ??
- context.indexesWithinAncestors.get(instance.id)?.toString();
- if (accordion && itemValue) {
- context.setPropVariable(accordion.id, "value", itemValue);
+ const item = getClosestInstance(
+ event.instancePath,
+ instance,
+ `${namespace}:AccordionItem`
+ );
+ if (accordion && item) {
+ const itemValue =
+ context.getPropValue(item.id, "value") ??
+ context.indexesWithinAncestors.get(item.id)?.toString();
+ if (itemValue) {
+ context.setPropVariable(accordion.id, "value", itemValue);
+ }
}
}
}