Skip to content

[Bug]: Tree, vertical spacing of branches and children is inconsistent #28681

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
petdud merged 9 commits into from
Jul 31, 2023
Merged

[Bug]: Tree, vertical spacing of branches and children is inconsistent #28681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c12459
paddingtop nested tree
Jul 31, 2023
afaccbb
change
Jul 31, 2023
48f29bc
Merge branch 'master' into tree-nested-spacing-top
petdud Jul 31, 2023
75110d6
token
Jul 31, 2023
d8f8a7a
Merge branch 'tree-nested-spacing-top' of https://github.com/petdud/f…
Jul 31, 2023
2aa0266
Update change/@fluentui-react-tree-0b6932ba-9e9f-4bc9-9d59-4d8152ff0c…
petdud Jul 31, 2023
32dad6f
Update packages/react-components/react-tree/src/components/Tree/useTr…
petdud Jul 31, 2023
a2a7eb8
remove unused styles
Jul 31, 2023
5b255c8
unused shortcuts
Jul 31, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-tree-0b6932ba-9e9f-4bc9-9d59-4d8152ff0cfe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "bugfix: Tree, vertical spacing of branches and children is inconsistent",
"packageName": "@fluentui/react-tree",
"email": "[email protected]",
"dependentChangeType": "patch"
}
14 changes: 2 additions & 12 deletions packages/react-components/react-tree/src/components/FlatTree/useFlatTreeStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, mergeClasses, shorthands } from '@griffel/react';
import { makeStyles, mergeClasses } from '@griffel/react';
import type { SlotClassNames } from '@fluentui/react-utilities';
import { tokens } from '@fluentui/react-theme';
import { FlatTreeSlots, FlatTreeState } from './FlatTree.types';
Expand All @@ -13,20 +13,10 @@ const useStyles = makeStyles({
flexDirection: 'column',
rowGap: tokens.spacingVerticalXXS,
},
subtree: {
...shorthands.flex(1, 1, '100%'),
...shorthands.gridArea('subtree'),
},
});

export const useFlatTreeStyles_unstable = (state: FlatTreeState): FlatTreeState => {
const styles = useStyles();
const isSubTree = state.level > 0;
state.root.className = mergeClasses(
flatTreeClassNames.root,
styles.root,
isSubTree && styles.subtree,
state.root.className,
);
state.root.className = mergeClasses(flatTreeClassNames.root, styles.root, state.root.className);
return state;
};
8 changes: 4 additions & 4 deletions packages/react-components/react-tree/src/components/Tree/useTreeStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, mergeClasses, shorthands } from '@griffel/react';
import { makeStyles, mergeClasses } from '@griffel/react';
import type { TreeSlots, TreeState } from './Tree.types';
import type { SlotClassNames } from '@fluentui/react-utilities';
import { tokens } from '@fluentui/react-theme';
Expand All @@ -14,14 +14,14 @@ const useStyles = makeStyles({
rowGap: tokens.spacingVerticalXXS,
},
subtree: {
...shorthands.flex(1, 1, '100%'),
...shorthands.gridArea('subtree'),
paddingTop: tokens.spacingVerticalXXS,
},
});

export const useTreeStyles_unstable = (state: TreeState): TreeState => {
const styles = useStyles();
const isSubTree = state.level > 0;
const isSubTree = state.level > 1;

state.root.className = mergeClasses(
treeClassNames.root,
styles.root,
Expand Down