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.

feat: Display navigator item show state (#3761)

Oleg Isonen4c41ca05c726
diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsx
index 7086934d5e..d6aa62238b 100644
--- a/apps/builder/app/builder/shared/tree/index.tsx
+++ b/apps/builder/app/builder/shared/tree/index.tsx
@@ -12,7 +12,7 @@ import {
rawTheme,
} from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/sdk";
-import { collectionComponent } from "@webstudio-is/react-sdk";
+import { collectionComponent, showAttribute } from "@webstudio-is/react-sdk";
import {
$propValuesByInstanceSelector,
$editingItemSelector,
@@ -151,12 +151,16 @@ export const InstanceTree = (
{...props}
canLeaveParent={canLeaveParent}
getItemChildren={getItemChildren}
- getItemProps={(itemData) => {
- if (itemData.component === "Slot") {
- return {
- style: getNodeVars({ color: rawTheme.colors.foregroundReusable }),
- };
- }
+ getItemProps={({ itemData, itemSelector }) => {
+ const props = propValues.get(JSON.stringify(itemSelector));
+ const opacity = props?.get(showAttribute) === false ? 0.4 : undefined;
+ const color =
+ itemData.component === "Slot"
+ ? rawTheme.colors.foregroundReusable
+ : undefined;
+ return {
+ style: getNodeVars({ color, opacity }),
+ };
}}
renderItem={renderItem}
editingItemId={editingItemSelector?.[0]}
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index c82acdcbd0..5a6227ac8a 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -174,13 +174,26 @@ const hoverStyle: CSS = {
};
const itemContainerColor: string = "--ws-tree-node-item-container-color";
+const itemContainerOpacity: string = "--ws-tree-node-item-container-opacity";
-export const getNodeVars = ({ color }: { color: string }) => ({
- [itemContainerColor]: color,
-});
+export const getNodeVars = ({
+ color,
+ opacity,
+}: {
+ color?: string;
+ opacity?: number;
+}) => {
+ return {
+ ...(color ? { [itemContainerColor]: color } : undefined),
+ ...(opacity !== undefined
+ ? { [itemContainerOpacity]: opacity }
+ : undefined),
+ };
+};
const ItemContainer = styled(Flex, {
color: `var(${itemContainerColor}, ${theme.colors.foregroundMain})`,
+ opacity: `var(${itemContainerOpacity}, 1)`,
alignItems: "center",
position: "relative",
...getItemButtonCssVars({ suffixVisible: false }),
@@ -424,7 +437,10 @@ export const TreeItemLabel = forwardRef(TreeItemLabelBase);
export type TreeNodeProps<Data extends { id: ItemId }> = {
itemData: Data;
getItemChildren: (itemSelector: ItemSelector) => Data[];
- getItemProps?: (itemData: Data) => ComponentProps<"div"> | undefined;
+ getItemProps?: (options: {
+ itemData: Data;
+ itemSelector: ItemSelector;
+ }) => ComponentProps<"div"> | undefined;
isItemHidden: (itemSelector: ItemSelector) => boolean;
renderItem: (props: TreeItemRenderProps<Data>) => React.ReactNode;
@@ -481,7 +497,10 @@ export const TreeNode = <Data extends { id: string }>({
const shouldRenderExpandButton = isExpandable && isAlwaysExpanded === false;
return (
- <div data-drop-target-id={itemData.id} {...getItemProps?.(itemData)}>
+ <div
+ data-drop-target-id={itemData.id}
+ {...getItemProps?.({ itemData, itemSelector })}
+ >
{/* optionally prevent rendering root item */}
{itemIsHidden === false &&
renderItem({