vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored Tree

pull/5677/head
Cagatay Civici 2024-04-26 01:47:09 +03:00
parent 32c202d2f2
commit 4bd7ce305f
3 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
components/lib/themes/primeone/base/tree/index.js
View File

@ -8,28 +8,28 @@ export default {
padding: 1rem; padding: 1rem;
} }
.p-tree-container { .p-tree-root-children {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
overflow: auto; overflow: auto;
} }
.p-treenode { .p-tree-node {
padding: 0 0; padding: 0 0;
outline: 0 none; outline: 0 none;
margin: 2px 0; margin: 2px 0;
} }
.p-tree-container > .p-treenode:first-child { .p-tree-root-children > .p-tree-node:first-child {
margin-top: 0; margin-top: 0;
} }
.p-tree-container > .p-treenode:last-child { .p-tree-root-children > .p-tree-node:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.p-treenode-content { .p-tree-node-content {
border-radius: ${dt('rounded.base')}; border-radius: ${dt('rounded.base')};
padding: 0.25rem 0.5rem; padding: 0.25rem 0.5rem;
display: flex; display: flex;
@ -39,17 +39,17 @@ export default {
transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, outline-color ${dt('transition.duration')}; transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, outline-color ${dt('transition.duration')};
} }
.p-treenode:focus-visible > .p-treenode-content { .p-tree-node:focus-visible > .p-tree-node-content {
outline: 1px solid ${dt('focus.ring.color')}; outline: 1px solid ${dt('focus.ring.color')};
outline-offset: -2px; outline-offset: -2px;
} }
.p-treenode-content.p-highlight { .p-tree-node-content.p-tree-node-selected {
background: ${dt('highlight.background')}; background: ${dt('highlight.background')};
color: ${dt('highlight.color')}; color: ${dt('highlight.color')};
} }
.p-tree-toggler { .p-tree-node-toggle-button {
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
display: inline-flex; display: inline-flex;
@ -69,68 +69,64 @@ export default {
outline-color: transparent; outline-color: transparent;
} }
.p-tree-toggler:enabled:hover { .p-tree-node-toggle-button:enabled:hover {
background: ${dt('tree.toggle.hover.background')}; background: ${dt('tree.toggle.hover.background')};
color: ${dt('tree.toggle.hover.color')}; color: ${dt('tree.toggle.hover.color')};
} }
.p-treenode-content.p-highlight .p-tree-toggler, .p-tree-node-content.p-tree-node-selected .p-tree-node-toggle-button,
.p-treenode-content.p-highlight .p-treenode-icon { .p-tree-node-content.p-tree-node-selected .p-tree-node-toggle-button-icon {
color: inherit; color: inherit;
} }
.p-treenode-content.p-highlight .p-tree-toggler:hover { .p-tree-node-content.p-tree-node-selected .p-tree-node-toggle-button:hover {
background: ${dt('tree.toggle.highlight.hover.background')}; background: ${dt('tree.toggle.highlight.hover.background')};
} }
.p-treenode-content.p-treenode-selectable:not(.p-highlight):hover { .p-tree-node-content.p-tree-node-selectable:not(.p-tree-node-selected):hover {
background: ${dt('tree.node.hover.background')}; background: ${dt('tree.node.hover.background')};
color: ${dt('tree.node.hover.color')}; color: ${dt('tree.node.hover.color')};
} }
.p-treenode-content.p-treenode-selectable:not(.p-highlight):hover .p-tree-toggler { .p-tree-node-content.p-tree-node-selectable:not(.p-tree-node-selected):hover .p-tree-node-toggle-button {
color: ${dt('tree.toggle.hover.color')}; color: ${dt('tree.toggle.hover.color')};
} }
.p-treenode-content.p-treenode-selectable:not(.p-highlight):hover .p-treenode-icon { .p-tree-node-content.p-tree-node-selectable:not(.p-tree-node-selected):hover .p-tree-node-icon {
color: ${dt('tree.icon.hover.color')}; color: ${dt('tree.icon.hover.color')};
} }
.p-treenode-children { .p-tree-node-children {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
padding: 0 0 0 1rem; padding: 0 0 0 1rem;
} }
.p-tree-wrapper { .p-tree-root {
overflow: auto; overflow: auto;
} }
.p-treenode-selectable { .p-tree-node-selectable {
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
} }
.p-treenode-leaf > .p-treenode-content .p-tree-toggler { .p-tree-node-leaf > .p-tree-node-content .p-tree-node-toggle-button {
visibility: hidden; visibility: hidden;
} }
.p-treenode-icon { .p-tree-node-icon {
margin-right: 0.5rem; margin-right: 0.5rem;
color: ${dt('tree.icon.color')}; color: ${dt('tree.icon.color')};
transition: color ${dt('transition.duration')}; transition: color ${dt('transition.duration')};
} }
.p-treenode-content .p-checkbox { .p-tree-node-content .p-checkbox {
margin-right: 0.5rem; margin-right: 0.5rem;
} }
.p-treenode-content .p-checkbox.p-indeterminate .p-checkbox-icon { .p-tree-filter-input {
color: ${dt('tree.indeterminate.color')};
}
.p-tree-filter {
width: 100%; width: 100%;
padding-right: 1.75rem; padding-right: 1.75rem;
} }
@ -147,7 +143,7 @@ export default {
top: 50%; top: 50%;
margin-top: -0.5rem; margin-top: -0.5rem;
right: 0.75rem; right: 0.75rem;
color: #94a3b8; color: ${dt('tree.filter.icon.color')};
} }
.p-tree-loading { .p-tree-loading {
@ -161,7 +157,7 @@ export default {
height: 2rem; height: 2rem;
} }
.p-tree-loading-overlay { .p-tree-mask {
position: absolute; position: absolute;
z-index: 1; z-index: 1;
display: flex; display: flex;
@ -176,7 +172,7 @@ export default {
flex-direction: column; flex-direction: column;
} }
.p-tree-flex-scrollable .p-tree-wrapper { .p-tree-flex-scrollable .p-tree-root {
flex: 1; flex: 1;
} }
` `

6
components/lib/themes/primeone/presets/aura/tree/index.js
View File

@ -20,8 +20,8 @@ export default {
color: '{surface.500}', color: '{surface.500}',
hoverColor: '{surface.600}' hoverColor: '{surface.600}'
}, },
indeterminate: { filterIcon: {
color: '{surface.500}' color: '{surface.400}'
} }
}, },
dark: { dark: {
@ -44,7 +44,7 @@ export default {
color: '{surface.400}', color: '{surface.400}',
hoverColor: '{surface.300}' hoverColor: '{surface.300}'
}, },
indeterminate: { filterIcon: {
color: '{surface.400}' color: '{surface.400}'
} }
} }

34
components/lib/tree/style/TreeStyle.js
View File

@ -9,33 +9,29 @@ const classes = {
'p-tree-flex-scrollable': props.scrollHeight === 'flex' 'p-tree-flex-scrollable': props.scrollHeight === 'flex'
} }
], ],
loadingOverlay: 'p-tree-loading-overlay p-component-overlay', loadingOverlay: 'p-tree-mask p-component-overlay',
loadingIcon: 'p-tree-loading-icon', loadingIcon: 'p-tree-loading-icon',
filterContainer: 'p-tree-filter-container', filterContainer: 'p-tree-filter-container',
input: 'p-tree-filter', input: 'p-tree-filter-input',
searchIcon: 'p-tree-filter-icon', searchIcon: 'p-tree-filter-icon',
wrapper: 'p-tree-wrapper', wrapper: 'p-tree-root',
container: 'p-tree-container', container: 'p-tree-root-children',
node: ({ instance }) => ['p-treenode', { 'p-treenode-leaf': instance.leaf }], node: ({ instance }) => ['p-tree-node', { 'p-tree-node-leaf': instance.leaf }],
content: ({ instance }) => [ content: ({ instance }) => [
'p-treenode-content', 'p-tree-node-content',
instance.node.styleClass, instance.node.styleClass,
{ {
'p-treenode-selectable': instance.selectable, 'p-tree-node-selectable': instance.selectable,
'p-highlight': instance.checkboxMode && instance.$parentInstance.highlightOnSelect ? instance.checked : instance.selected 'p-tree-node-selected': instance.checkboxMode && instance.$parentInstance.highlightOnSelect ? instance.checked : instance.selected
} }
], ],
toggler: 'p-tree-toggler p-link', toggler: 'p-tree-node-toggle-button',
togglerIcon: 'p-tree-toggler-icon', togglerIcon: 'p-tree-node-toggle-button-icon',
nodeTogglerIcon: 'p-tree-node-toggler-icon', nodeTogglerIcon: 'p-tree-node-toggler-icon', //todo: discuss
nodeCheckbox: ({ instance }) => [ nodeCheckbox: 'p-tree-node-checkbox',
{ nodeIcon: 'p-tree-node-icon',
'p-indeterminate': instance.partialChecked label: 'p-tree-node-label',
} subgroup: 'p-tree-node-children'
],
nodeIcon: 'p-treenode-icon',
label: 'p-treenode-label',
subgroup: 'p-treenode-children'
}; };
export default BaseStyle.extend({ export default BaseStyle.extend({