@elliemae/ds-treeview 2.4.3 → 2.4.4-rc.0

package/cjs/hoc/WithConditionalDnDContext.js

@@ -70,9 +70,9 @@ const withConditionalDnDRowContext = Component => props => {
     // Pull the row's original data into an object
     const nodes = {};
     tree.forEach(item => {
-      const originalItem = item.original;
+      const originalItem = item.original.model;
       originalItem.children = [];
-      nodes[item.uid] = item.original;
+      nodes[item.uid] = originalItem;
     });
     const newUserTree = [];
     tree.forEach(item => {
@@ -80,8 +80,10 @@ const withConditionalDnDRowContext = Component => props => {
       // otherwise append it to the new user data
       if (item.parentId !== null && item.parentId !== undefined && item.parentId !== '__ds_tree_root') {
         const parentNode = nodes[item.parentId];
-        parentNode.children?.push(item.original);
-      } else if (item.uid !== '__ds_tree_root') newUserTree.push(item.original);
+        parentNode.children?.push(item.original.model);
+      } else if (item.uid !== '__ds_tree_root') {
+        newUserTree.push(item.original.model);
+      }
     }); // Tell the user that the order has change, he can chose to commit it or not
 
     onOrderChange(newUserTree, data, flattenedItems[indexes.fromIndex]);

package/cjs/utils/tree-helpers.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('core-js/modules/esnext.async-iterator.for-each.js');
 require('core-js/modules/esnext.iterator.constructor.js');
 require('core-js/modules/esnext.iterator.for-each.js');
@@ -10,9 +11,18 @@ require('core-js/modules/esnext.async-iterator.find.js');
 require('core-js/modules/esnext.iterator.find.js');
 require('core-js/modules/esnext.async-iterator.every.js');
 require('core-js/modules/esnext.iterator.every.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.filter.js');
 var React = require('react');
 var stringHelpers = require('./string-helpers.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const walkVisibles = function (node, callback) {
   let skipRoot = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   let highlightOnlyQuery = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
@@ -185,18 +195,18 @@ const flattenTreeForDnD = function (data) {
     let depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let parentId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     flattenedTree.push({
-      uid: node.id.toString(),
+      uid: node.model.id.toString(),
       depth,
       realIndex: index,
       childrenCount: node.children?.length ?? 0,
       parentId: parentId !== null ? parentId.toString() : null,
-      original: node
+      original: _objectSpread(_objectSpread({}, node), node.model)
     });
     index += 1;
-    if (shouldDescend(node)) node.children?.forEach(child => doit(child, depth + 1, node.id.toString()));
+    if (shouldDescend(node)) node.children?.forEach(child => doit(child, depth + 1, node.model.id.toString()));
   };
 
-  data.forEach(datum => doit(datum));
+  data.children.forEach(node => doit(node));
   return flattenedTree;
 };
 

package/cjs/utils/useTree.js

@@ -92,7 +92,7 @@ const useTree = (data, props, states) => {
     setExpandedGroups(newExpandedHashMap); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [treeRoot, rerenderItems, searchQuery, highlightOnlyQuery, selection, expanded, setExpandedGroups // onVisibleItemsChange // evaluate potential performance hit?
   ]);
-  const flattenedItems = React.useMemo(() => treeHelpers.flattenTreeForDnD(data), [data]);
+  const flattenedItems = React.useMemo(() => treeHelpers.flattenTreeForDnD(treeRoot), [treeRoot]);
   return {
     visibleItems,
     flattenedItems,

package/esm/hoc/WithConditionalDnDContext.js

@@ -61,9 +61,9 @@ const withConditionalDnDRowContext = Component => props => {
     // Pull the row's original data into an object
     const nodes = {};
     tree.forEach(item => {
-      const originalItem = item.original;
+      const originalItem = item.original.model;
       originalItem.children = [];
-      nodes[item.uid] = item.original;
+      nodes[item.uid] = originalItem;
     });
     const newUserTree = [];
     tree.forEach(item => {
@@ -71,8 +71,10 @@ const withConditionalDnDRowContext = Component => props => {
       // otherwise append it to the new user data
       if (item.parentId !== null && item.parentId !== undefined && item.parentId !== '__ds_tree_root') {
         const parentNode = nodes[item.parentId];
-        parentNode.children?.push(item.original);
-      } else if (item.uid !== '__ds_tree_root') newUserTree.push(item.original);
+        parentNode.children?.push(item.original.model);
+      } else if (item.uid !== '__ds_tree_root') {
+        newUserTree.push(item.original.model);
+      }
     }); // Tell the user that the order has change, he can chose to commit it or not
 
     onOrderChange(newUserTree, data, flattenedItems[indexes.fromIndex]);

package/esm/utils/tree-helpers.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.constructor.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
@@ -6,9 +7,14 @@ import 'core-js/modules/esnext.async-iterator.find.js';
 import 'core-js/modules/esnext.iterator.find.js';
 import 'core-js/modules/esnext.async-iterator.every.js';
 import 'core-js/modules/esnext.iterator.every.js';
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.filter.js';
 import { createRef } from 'react';
 import { standardizeSearchQueryString } from './string-helpers.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const walkVisibles = function (node, callback) {
   let skipRoot = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   let highlightOnlyQuery = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
@@ -181,18 +187,18 @@ const flattenTreeForDnD = function (data) {
     let depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let parentId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     flattenedTree.push({
-      uid: node.id.toString(),
+      uid: node.model.id.toString(),
       depth,
       realIndex: index,
       childrenCount: node.children?.length ?? 0,
       parentId: parentId !== null ? parentId.toString() : null,
-      original: node
+      original: _objectSpread(_objectSpread({}, node), node.model)
     });
     index += 1;
-    if (shouldDescend(node)) node.children?.forEach(child => doit(child, depth + 1, node.id.toString()));
+    if (shouldDescend(node)) node.children?.forEach(child => doit(child, depth + 1, node.model.id.toString()));
   };
 
-  data.forEach(datum => doit(datum));
+  data.children.forEach(node => doit(node));
   return flattenedTree;
 };
 

package/esm/utils/useTree.js

@@ -83,7 +83,7 @@ const useTree = (data, props, states) => {
     setExpandedGroups(newExpandedHashMap); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [treeRoot, rerenderItems, searchQuery, highlightOnlyQuery, selection, expanded, setExpandedGroups // onVisibleItemsChange // evaluate potential performance hit?
   ]);
-  const flattenedItems = useMemo(() => flattenTreeForDnD(data), [data]);
+  const flattenedItems = useMemo(() => flattenTreeForDnD(treeRoot), [treeRoot]);
   return {
     visibleItems,
     flattenedItems,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-treeview",
-  "version": "2.4.3",
+  "version": "2.4.4-rc.0",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Tree View",
   "module": "./esm/index.js",
@@ -229,15 +229,15 @@
   "dependencies": {
     "@dnd-kit/core": "~4.0.1",
     "@dnd-kit/sortable": "~5.0.0",
-    "@elliemae/ds-button": "2.4.3",
-    "@elliemae/ds-circular-progress-indicator": "2.4.3",
-    "@elliemae/ds-classnames": "2.4.3",
-    "@elliemae/ds-drag-and-drop": "2.4.3",
-    "@elliemae/ds-form": "2.4.3",
-    "@elliemae/ds-icons": "2.4.3",
-    "@elliemae/ds-props-helpers": "2.4.3",
-    "@elliemae/ds-truncated-tooltip-text": "2.4.3",
-    "@elliemae/ds-utilities": "2.4.3",
+    "@elliemae/ds-button": "2.4.4-rc.0",
+    "@elliemae/ds-circular-progress-indicator": "2.4.4-rc.0",
+    "@elliemae/ds-classnames": "2.4.4-rc.0",
+    "@elliemae/ds-drag-and-drop": "2.4.4-rc.0",
+    "@elliemae/ds-form": "2.4.4-rc.0",
+    "@elliemae/ds-icons": "2.4.4-rc.0",
+    "@elliemae/ds-props-helpers": "2.4.4-rc.0",
+    "@elliemae/ds-truncated-tooltip-text": "2.4.4-rc.0",
+    "@elliemae/ds-utilities": "2.4.4-rc.0",
     "react-desc": "~4.1.3",
     "react-highlight-words": "~0.17.0",
     "react-virtual": "~2.8.2",

package/types/react-desc-prop-types.d.ts

@@ -38,7 +38,7 @@ export declare namespace DSTreeviewT {
         realIndex: number;
         childrenCount: number;
         parentId: string | null;
-        original: SimpleItem;
+        original: DSTreeviewT.Item;
     }
     interface Actions {
         toggleExpandAll: (isExpand: boolean) => Promise<DSTreeviewT.Item[]>;

package/types/utils/tree-helpers.d.ts

@@ -24,5 +24,5 @@ export declare const getChildrenMatchesSearchQuery: (parentNode: DSTreeviewT.Ite
  */
 export declare const enrichNodeModelInPlace: (node: TreeModel.Node<DSTreeviewT.SimpleItem>, searchQuery?: string, selection?: DSTreeviewT.SelectionItems | null, expanded?: DSTreeviewT.ExpandedItems | null) => void;
 export declare const focusItem: (item: DSTreeviewT.Item | null) => void;
-export declare const flattenTreeForDnD: (data: DSTreeviewT.SimpleItem[], shouldDescend?: (datum: DSTreeviewT.SimpleItem) => boolean) => DSTreeviewT.DndItem[];
+export declare const flattenTreeForDnD: (data: TreeModel.Node<DSTreeviewT.Item>, shouldDescend?: (datum: TreeModel.Node<DSTreeviewT.Item>) => boolean) => DSTreeviewT.DndItem[];
 export {};