Skip to content

feat: use 24px item height to fit more in the navigator #4933

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 4 commits into from
Mar 6, 2025
Merged

feat: use 24px item height to fit more in the navigator #4933

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c7fd40
use 24px item height to fit more in navigator
kof Feb 28, 2025
7a4d4fb
since there is invisible root, we need to render items on a lower level
kof Feb 28, 2025
7e4f2db
Merge branch 'main' into navigator-item
kof Feb 28, 2025
1a70f0d
Revert "since there is invisible root, we need to render items on a l…
kof Feb 28, 2025
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
6 changes: 3 additions & 3 deletions apps/builder/app/builder/features/pages/pages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ const PagesTree = ({
useReparentOrphans();

if (pages === undefined) {
return null;
return;
}

return (
Expand Down Expand Up @@ -342,7 +342,7 @@ const PagesTree = ({
return (
<TreeSortableItem
key={item.id}
level={item.level}
level={item.level - 1}
isExpanded={item.isExpanded}
isLastChild={item.isLastChild}
data={item}
Expand Down Expand Up @@ -392,7 +392,7 @@ const PagesTree = ({
}}
>
<TreeNode
level={item.level}
level={item.level - 1}
tabbable={index === 0}
isSelected={item.id === selectedPageId}
isHighlighted={dropTarget?.parentId === item.id}
Expand Down
3 changes: 1 addition & 2 deletions packages/design-system/src/components/tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const treeActionOpacity = "--tree-action-opacity";
const treeDepthBarsVisibility = "--tree-depth-bars-visibility";
const treeDepthBarsColor = "--tree-depth-bars-color";

const ITEM_HEIGHT = 32;
const ITEM_PADDING_LEFT = 8;
// extra padding on the right to make sure scrollbar doesn't obscure anything
const ITEM_PADDING_RIGHT = 10;
Expand Down Expand Up @@ -95,7 +94,7 @@ export const TreeRoot = ({ children }: { children: ReactNode }) => {

const NodeContainer = styled("div", {
position: "relative",
height: ITEM_HEIGHT,
height: theme.sizes.controlHeight,
"&:hover, &:has(:focus-visible), &:has([aria-current=true])": {
[treeNodeBackgroundColor]: theme.colors.backgroundHover,
backgroundColor: `var(${treeNodeBackgroundColor})`,
Expand Down