@dataloop-ai/components 0.20.162 → 0.20.164

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.20.162",
+  "version": "0.20.164",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/components/basic/DlButton/DlButton.vue

@@ -203,7 +203,11 @@ export default defineComponent({
         /**
          * Overwrite default text color on hover
          */
-        hoverTextColor: { type: String, default: null }
+        hoverTextColor: { type: String, default: null },
+        /**
+         * Override icon color when button is disabled
+         */
+        disabledIconColor: { type: String, default: null }
     },
     emits: ['click', 'mousedown', 'dblclick'],
     setup(props) {
@@ -243,6 +247,9 @@ export default defineComponent({
         },
         getIconColor(): string {
             if (this.disabled) {
+                if (this.disabledIconColor) {
+                    return this.disabledIconColor
+                }
                 return setTextColor({
                     disabled: this.disabled,
                     outlined: this.outlined,
@@ -569,6 +576,7 @@ export default defineComponent({
 
 .dl-button-icon {
     transition: var(--dl-button-text-transition-duration);
+    transition-property: color;
 }
 
 .dl-button-container {

package/src/components/compound/DlTreeTable/utils/treeTableRowSelection.ts

@@ -78,12 +78,70 @@ export function useTreeTableRowSelection(
         selectedItemsNested.value = []
     }
 
+    function getParentIds(childId: string): string[] {
+        const rows = computedRows.value as DlTableRow[]
+        const roots = Array.isArray(rows) ? rows : [rows]
+        const stack = roots.map((n) => [n, []])
+
+        while (stack.length) {
+            const [node, path]: [DlTableRow, string[]] = stack.pop() as [
+                DlTableRow,
+                string[]
+            ]
+            if (node.id === childId) return path as string[]
+            const children = (node as DlTableRow).children
+            if (Array.isArray(children) && children.length) {
+                for (let i = 0; i < children.length; i++) {
+                    const c = children[i]
+                    if (c) stack.push([c, path.concat(node.id)])
+                }
+            }
+        }
+        return []
+    }
+
+    function isDescendantOf(
+        rows: DlTableRow[],
+        parentId: string,
+        targets: string[]
+    ): boolean {
+        if (!Array.isArray(rows)) rows = [rows]
+
+        const targetSet = new Set(Array.isArray(targets) ? targets : [targets])
+        targetSet.delete(parentId)
+        if (targetSet.size === 0) return false
+
+        const stack = rows.slice()
+        let parent = null
+        while (stack.length) {
+            const node = stack.pop()
+            if (node && node.id === parentId) {
+                parent = node
+                break
+            }
+            if (node && node.children && node.children.length)
+                stack.push(...node.children)
+        }
+        if (!parent) return false
+
+        const sub = (parent.children && parent.children.slice()) || []
+        while (sub.length) {
+            const n = sub.pop()
+            if (targetSet.has(n.id)) return true
+            if (n && n.children && n.children.length) sub.push(...n.children)
+        }
+        return false
+    }
+
     function updateSelection(
-        keys: string[],
+        updatedKeys: string[],
         rows: (string | DlTableRow)[],
         added: boolean,
         evt?: (event: string, val: any) => void
     ) {
+        const keys = added
+            ? updatedKeys
+            : [...getParentIds(updatedKeys[0]), ...updatedKeys]
         emit('selection', { rows, added, keys, evt })
 
         /*
@@ -162,6 +220,15 @@ export function useTreeTableRowSelection(
                     return false
                 }
             )
+            if (
+                isDescendantOf(
+                    computedRows.value,
+                    rowKeyValue,
+                    originalRows.map((item) => (item as DlTableRow).id)
+                )
+            ) {
+                return 'partial'
+            }
         }
         if (getSelectedRowByRowKey && getOriginalRowByRowKey) {
             if (