Merge branch 'master' into dev-to-master

smeup · Sep 28, 2022 · 16b4579 · 16b4579
2 parents 32bcbe1 + 5e5a68d
commit 16b4579
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 9 deletions.
diff --git a/packages/ketchup/src/assets/data-table.js b/packages/ketchup/src/assets/data-table.js
@@ -949,6 +949,50 @@ const mockedRows = [
             },
         },
     },
+    {
+        cells: {
+            FLD1: {
+                obj: {
+                    t: 'CN',
+                    p: 'COL',
+                    k: 'CASFRA',
+                },
+                value: 'CASFRA',
+            },
+            FLD2: {
+                obj: {
+                    t: 'NR',
+                    p: '',
+                    k: '10',
+                },
+                value: '10',
+            },
+            FLD3: {
+                obj: {
+                    t: 'NR',
+                    p: '',
+                    k: '100000.60',
+                },
+                value: '100,000.60',
+            },
+            FLD4: {
+                obj: {
+                    t: 'D8',
+                    p: '*YYMD',
+                    k: '20181101',
+                },
+                value: '2018-11-01',
+            },
+            FLD5: {
+                obj: {
+                    t: 'NR',
+                    p: 'P',
+                    k: '0',
+                },
+                value: '0.00',
+            },
+        },
+    },
     {
         cells: {
             FLD1: {

diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table-state.ts b/packages/ketchup/src/components/kup-data-table/kup-data-table-state.ts
@@ -14,8 +14,8 @@ export class KupDataTableState implements KupState {
     expandGroups = false;
     groupLabelDisplay = GroupLabelDisplayMode.BOTH;
     density: string = 'small';
-    enableSortableColumns: boolean = false;
     enableExtraColumns: boolean = true;
+    enableSortableColumns: boolean = false;
     forceOneLine: boolean = false;
     globalFilter = false;
     globalFilterValue = '';

diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
@@ -2145,7 +2145,6 @@ export class KupDataTable {
 
     private getEventPath(currentEl: unknown): HTMLElement[] {
         const path: HTMLElement[] = [];
-
         while (
             currentEl &&
             currentEl !== this.rootElement &&

diff --git a/packages/ketchup/src/components/kup-time-picker/kup-time-picker.tsx b/packages/ketchup/src/components/kup-time-picker/kup-time-picker.tsx
@@ -397,10 +397,10 @@ export class KupTimePicker {
         this.value = value;
     }
 
+
     /*-------------------------------------------------*/
     /*           P r i v a t e   M e t h o d s         */
     /*-------------------------------------------------*/
-
     getFormattedValue(value: string): string {
         return formattedStringToCustomUnformattedStringTime(
             value,

diff --git a/packages/ketchup/src/components/kup-tree/kup-tree.tsx b/packages/ketchup/src/components/kup-tree/kup-tree.tsx
@@ -370,7 +370,6 @@ export class KupTree {
      */
     private columnMenuCard: HTMLKupCardElement = null;
     private treeWrapperRef: KupScrollOnHoverElement;
-    private selectedColumn: string = '';
     private clickTimeout: any[] = [];
     private globalFilterTimeout: number;
     private footer: { [index: string]: number };
@@ -1030,6 +1029,11 @@ export class KupTree {
             (this.expansionMode.toLowerCase() === KupTreeExpansionMode.NODE &&
                 !treeNodeData.expandable)
         ) {
+            const td = e
+                ? this.getEventPath(e.target).find((el) => {
+                      if (el.tagName === 'TD') return el;
+                  })
+                : null;
             // If this TreeNode is not disabled, then it can be selected and an event is emitted
             if (treeNodeData && !treeNodeData.disabled) {
                 if (this.autoSelectionNodeMode)
@@ -1044,11 +1048,10 @@ export class KupTree {
                         .split(',')
                         .map((treeNodeIndex) => parseInt(treeNodeIndex)),
                     treeNode: treeNodeData,
-                    columnName: this.selectedColumn,
+                    columnName: td ? td.dataset.column : null,
                     auto: auto,
                 });
             }
-            this.selectedColumn = '';
         }
 
         // If KupTreeExpansionMode.NODE then click is a collapse/expand click
@@ -1550,12 +1553,18 @@ export class KupTree {
 
         // When can be expanded OR selected
         if (!treeNodeData.disabled) {
-            treeNodeOptions['onClick'] = () => {
+            treeNodeOptions['onClick'] = (e: MouseEvent) => {
+                // Note: event must be cloned
+                // otherwise inside setTimeout will be exiting the Shadow DOM scope(causing loss of information, including target).
+                const clone: GenericObject = {};
+                for (const key in e) {
+                    clone[key] = e[key];
+                }
                 this.clickTimeout.push(
                     setTimeout(
-                        (e: MouseEvent) =>
+                        () =>
                             this.hdlTreeNodeClick(
-                                e,
+                                clone as MouseEvent,
                                 treeNodeData,
                                 treeNodePath,
                                 false
@@ -1569,6 +1578,10 @@ export class KupTree {
         // When a tree node is displayed as a table
         let treeNodeCells: JSX.Element[] | null = null;
         let visibleCols = this.getVisibleColumns();
+
+        const _hasTooltip: boolean = !this.kupManager.objects.isEmptyKupObj(
+            treeNodeData.obj
+        );
         if (this.showColumns && visibleCols && visibleCols.length) {
             treeNodeCells = [];
             // Renders all the cells