@deephaven/iris-grid 0.24.1-hierarchical-table.0 → 0.25.0

package/dist/sidebar/visibility-ordering-builder/sortable-tree/utilities.js

@@ -0,0 +1,265 @@
+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; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+import { arrayMove } from '@dnd-kit/sortable';
+import { GridUtils } from '@deephaven/grid';
+import { isFlattenedTreeItem } from "./types.js";
+/**
+ * Gets the depth of an item dragged with a given x-axis offset
+ *
+ * @param offset x-axis offset of the dragging item
+ * @param indentationWidth Width of indentation for each depth
+ * @returns The drag depth for the given offset
+ */
+function getDragDepth(offset, indentationWidth) {
+  return Math.round(offset / indentationWidth);
+}
+function getTreeItem(columns, movedColumns, columnHeaderGroupMap, name, userColumnWidths, selectedItems) {
+  var _userColumnWidths$get2;
+  var modelIndex = columns.findIndex(col => col.name === name);
+  if (modelIndex === -1) {
+    var group = columnHeaderGroupMap.get(name);
+    if (group == null) {
+      throw new Error("Column or header group not found: ".concat(name));
+    }
+    var modelIndexes = group.childIndexes.flat();
+    return {
+      id: name,
+      selected: selectedItems.has(name),
+      children: group.children.map(childName => getTreeItem(columns, movedColumns, columnHeaderGroupMap, childName, userColumnWidths, selectedItems)).sort((a, b) => {
+        var aVal = Array.isArray(a.data.visibleIndex) ? a.data.visibleIndex[0] : a.data.visibleIndex;
+        var bVal = Array.isArray(b.data.visibleIndex) ? b.data.visibleIndex[0] : b.data.visibleIndex;
+        return aVal - bVal;
+      }),
+      data: {
+        modelIndex: modelIndexes,
+        visibleIndex: group.getVisibleRange(movedColumns),
+        group,
+        isVisible: modelIndexes.some(
+        // If no user set width, assume it's visible
+        index => {
+          var _userColumnWidths$get;
+          return ((_userColumnWidths$get = userColumnWidths.get(index)) !== null && _userColumnWidths$get !== void 0 ? _userColumnWidths$get : 1) > 0;
+        })
+      }
+    };
+  }
+  return {
+    id: name,
+    children: [],
+    selected: selectedItems.has(name),
+    data: {
+      modelIndex,
+      visibleIndex: GridUtils.getVisibleIndex(modelIndex, movedColumns),
+      // If no user set width, assume it's visible
+      isVisible: ((_userColumnWidths$get2 = userColumnWidths.get(modelIndex)) !== null && _userColumnWidths$get2 !== void 0 ? _userColumnWidths$get2 : 1) > 0
+    }
+  };
+}
+export function getTreeItems(columns, movedColumns, columnHeaderGroups, userColumnWidths, selectedItems) {
+  var items = [];
+  var selectedItemsSet = new Set(selectedItems);
+  var groupMap = new Map(columnHeaderGroups.map(group => [group.name, group]));
+  var visibleIndex = 0;
+  var _loop = function _loop() {
+    var modelIndex = GridUtils.getModelIndex(visibleIndex, movedColumns);
+    var columnName = columns[modelIndex].name;
+    var group = columnHeaderGroups.find(_ref => {
+      var {
+        children
+      } = _ref;
+      return children.includes(columnName);
+    });
+    while (group !== undefined && group.parent !== undefined) {
+      group = groupMap.get(group.parent);
+    }
+    var item = getTreeItem(columns, movedColumns, groupMap, group ? group.name : columnName, userColumnWidths, selectedItemsSet);
+    items.push(item);
+    if (Array.isArray(item.data.visibleIndex)) {
+      visibleIndex += item.data.visibleIndex[1] - item.data.visibleIndex[0] + 1;
+    } else {
+      visibleIndex += 1;
+    }
+  };
+  while (visibleIndex < columns.length) {
+    _loop();
+  }
+  return items;
+}
+
+/**
+ * Gets the projected drop position and depth of the dragged item
+ *
+ * @param items List of flattened items
+ * @param activeId ID of the actively dragged item
+ * @param overId ID of the item currently being dragged over
+ * @param dragOffset The x-axis offset of the dragged item
+ * @param indentationWidth The width for each level of the tree
+ * @returns The projected position and depth if the item were to be dropped
+ */
+export function getProjection(items, activeId, overId, dragOffset, indentationWidth) {
+  var overItemIndex = items.findIndex(_ref2 => {
+    var {
+      id
+    } = _ref2;
+    return id === overId;
+  });
+  var activeItemIndex = items.findIndex(_ref3 => {
+    var {
+      id
+    } = _ref3;
+    return id === activeId;
+  });
+  var activeItem = items[activeItemIndex];
+  var newItems = arrayMove(items, activeItemIndex, overItemIndex);
+  var previousItem = newItems[overItemIndex - 1];
+  var nextItem = newItems[overItemIndex + 1];
+  var dragDepth = getDragDepth(dragOffset, indentationWidth);
+  var projectedDepth = activeItem.depth + dragDepth;
+  var maxDepth = getMaxDepth({
+    previousItem,
+    nextItem
+  });
+  var minDepth = getMinDepth({
+    nextItem
+  });
+  var depth = projectedDepth;
+  if (projectedDepth >= maxDepth) {
+    depth = maxDepth;
+  } else if (projectedDepth < minDepth) {
+    depth = minDepth;
+  }
+  return {
+    depth,
+    maxDepth,
+    minDepth,
+    parentId: getParentId()
+  };
+  function getParentId() {
+    var _newItems$slice$rever;
+    if (depth === 0 || !previousItem) {
+      return null;
+    }
+    if (depth === previousItem.depth) {
+      return previousItem.parentId;
+    }
+    if (depth > previousItem.depth) {
+      return previousItem.id;
+    }
+    var newParent = (_newItems$slice$rever = newItems.slice(0, overItemIndex).reverse().find(item => item.depth === depth)) === null || _newItems$slice$rever === void 0 ? void 0 : _newItems$slice$rever.parentId;
+    return newParent !== null && newParent !== void 0 ? newParent : null;
+  }
+}
+function getMaxDepth(_ref4) {
+  var _previousItem$depth, _nextItem$depth;
+  var {
+    previousItem,
+    nextItem
+  } = _ref4;
+  return Math.max((_previousItem$depth = previousItem === null || previousItem === void 0 ? void 0 : previousItem.depth) !== null && _previousItem$depth !== void 0 ? _previousItem$depth : 0, (_nextItem$depth = nextItem === null || nextItem === void 0 ? void 0 : nextItem.depth) !== null && _nextItem$depth !== void 0 ? _nextItem$depth : 0);
+}
+function getMinDepth(_ref5) {
+  var {
+    nextItem
+  } = _ref5;
+  if (nextItem) {
+    return nextItem.depth;
+  }
+  return 0;
+}
+
+/**
+ * Helper function to recursively flatten a tree
+ *
+ * @param items Items to flatten
+ * @param parentId The current parentId of the items
+ * @param depth The current depth of the items
+ * @returns Flattened items
+ */
+function flatten(items) {
+  var parentId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  var depth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  return items.reduce((acc, item, index) => [...acc, _objectSpread(_objectSpread({}, item), {}, {
+    parentId,
+    depth,
+    index
+  }), ...flatten(item.children, item.id, depth + 1)], []);
+}
+
+/**
+ * Flattens a tree into a 1D array given the items
+ * @param items The tree items to flatten
+ * @returns The flattened tree items list
+ */
+export function flattenTree(items) {
+  // Should help prevent double flattening since FlattenedItems are valid TreeItems
+  if (items.every(isFlattenedTreeItem)) {
+    return items;
+  }
+  return flatten(items);
+}
+
+/**
+ * Recursively checks for the item in a list of items.
+ * The list does not have to be flattened prior to searching.
+ *
+ * @param items Items to search
+ * @param itemId Item to find
+ * @returns The item if found
+ */
+export function findItemDeep(items, itemId) {
+  for (var i = 0; i < items.length; i += 1) {
+    var item = items[i];
+    var {
+      id,
+      children
+    } = item;
+    if (id === itemId) {
+      return item;
+    }
+    if (children.length) {
+      var child = findItemDeep(children, itemId);
+      if (child) {
+        return child;
+      }
+    }
+  }
+  return undefined;
+}
+function countChildren(items) {
+  var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return items.reduce((acc, _ref6) => {
+    var {
+      children
+    } = _ref6;
+    if (children.length) {
+      return countChildren(children, acc + 1);
+    }
+    return acc + 1;
+  }, count);
+}
+export function getChildCount(items, id) {
+  var item = findItemDeep(items, id);
+  return item ? countChildren(item.children) : 0;
+}
+
+/**
+ * Removes the children of the list of parents from the list of flattened items
+ *
+ * @param items The flattened items to remove from
+ * @param ids The parents we want to remove the children of
+ * @returns The flattened items without the children of the parents
+ */
+export function removeChildrenOf(items, ids) {
+  var excludeParentIds = new Set(ids);
+  return items.filter(item => {
+    if (item.parentId != null && excludeParentIds.has(item.parentId)) {
+      if (item.children.length) {
+        excludeParentIds.add(item.id);
+      }
+      return false;
+    }
+    return true;
+  });
+}
+//# sourceMappingURL=utilities.js.map

package/dist/sidebar/visibility-ordering-builder/sortable-tree/utilities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utilities.js","names":["arrayMove","GridUtils","isFlattenedTreeItem","getDragDepth","offset","indentationWidth","Math","round","getTreeItem","columns","movedColumns","columnHeaderGroupMap","name","userColumnWidths","selectedItems","modelIndex","findIndex","col","group","get","Error","modelIndexes","childIndexes","flat","id","selected","has","children","map","childName","sort","a","b","aVal","Array","isArray","data","visibleIndex","bVal","getVisibleRange","isVisible","some","index","getVisibleIndex","getTreeItems","columnHeaderGroups","items","selectedItemsSet","Set","groupMap","Map","getModelIndex","columnName","find","includes","undefined","parent","item","push","length","getProjection","activeId","overId","dragOffset","overItemIndex","activeItemIndex","activeItem","newItems","previousItem","nextItem","dragDepth","projectedDepth","depth","maxDepth","getMaxDepth","minDepth","getMinDepth","parentId","getParentId","newParent","slice","reverse","max","flatten","reduce","acc","flattenTree","every","findItemDeep","itemId","i","child","countChildren","count","getChildCount","removeChildrenOf","ids","excludeParentIds","filter","add"],"sources":["../../../../src/sidebar/visibility-ordering-builder/sortable-tree/utilities.ts"],"sourcesContent":["import { arrayMove } from '@dnd-kit/sortable';\nimport type { Column } from '@deephaven/jsapi-shim';\nimport { GridUtils, ModelSizeMap, MoveOperation } from '@deephaven/grid';\nimport type ColumnHeaderGroup from '../../../ColumnHeaderGroup';\nimport { isFlattenedTreeItem } from './types';\nimport type { FlattenedItem, TreeItem, TreeItems } from './types';\n\n/**\n * Gets the depth of an item dragged with a given x-axis offset\n *\n * @param offset x-axis offset of the dragging item\n * @param indentationWidth Width of indentation for each depth\n * @returns The drag depth for the given offset\n */\nfunction getDragDepth(offset: number, indentationWidth: number) {\n  return Math.round(offset / indentationWidth);\n}\n\ninterface IrisGridTreeItemData {\n  modelIndex: number | number[];\n  visibleIndex: number | [number, number];\n  isVisible: boolean;\n  group?: ColumnHeaderGroup;\n}\n\nexport type IrisGridTreeItem = TreeItem<IrisGridTreeItemData>;\n\nexport type FlattenedIrisGridTreeItem = FlattenedItem<IrisGridTreeItemData>;\n\nfunction getTreeItem(\n  columns: Column[],\n  movedColumns: MoveOperation[],\n  columnHeaderGroupMap: Map<string, ColumnHeaderGroup>,\n  name: string,\n  userColumnWidths: ModelSizeMap,\n  selectedItems: Set<string>\n): IrisGridTreeItem {\n  const modelIndex = columns.findIndex(col => col.name === name);\n  if (modelIndex === -1) {\n    const group = columnHeaderGroupMap.get(name);\n\n    if (group == null) {\n      throw new Error(`Column or header group not found: ${name}`);\n    }\n\n    const modelIndexes = group.childIndexes.flat();\n\n    return {\n      id: name,\n      selected: selectedItems.has(name),\n      children: group.children\n        .map(childName =>\n          getTreeItem(\n            columns,\n            movedColumns,\n            columnHeaderGroupMap,\n            childName,\n            userColumnWidths,\n            selectedItems\n          )\n        )\n        .sort((a, b) => {\n          const aVal = Array.isArray(a.data.visibleIndex)\n            ? a.data.visibleIndex[0]\n            : a.data.visibleIndex;\n          const bVal = Array.isArray(b.data.visibleIndex)\n            ? b.data.visibleIndex[0]\n            : b.data.visibleIndex;\n          return aVal - bVal;\n        }),\n      data: {\n        modelIndex: modelIndexes,\n        visibleIndex: group.getVisibleRange(movedColumns),\n        group,\n        isVisible: modelIndexes.some(\n          // If no user set width, assume it's visible\n          index => (userColumnWidths.get(index) ?? 1) > 0\n        ),\n      },\n    };\n  }\n\n  return {\n    id: name,\n    children: [],\n    selected: selectedItems.has(name),\n    data: {\n      modelIndex,\n      visibleIndex: GridUtils.getVisibleIndex(modelIndex, movedColumns),\n      // If no user set width, assume it's visible\n      isVisible: (userColumnWidths.get(modelIndex) ?? 1) > 0,\n    },\n  };\n}\n\nexport function getTreeItems(\n  columns: Column[],\n  movedColumns: MoveOperation[],\n  columnHeaderGroups: ColumnHeaderGroup[],\n  userColumnWidths: ModelSizeMap,\n  selectedItems: string[]\n): IrisGridTreeItem[] {\n  const items: IrisGridTreeItem[] = [];\n  const selectedItemsSet = new Set(selectedItems);\n  const groupMap = new Map(\n    columnHeaderGroups.map(group => [group.name, group])\n  );\n\n  let visibleIndex = 0;\n  while (visibleIndex < columns.length) {\n    const modelIndex = GridUtils.getModelIndex(visibleIndex, movedColumns);\n    const columnName = columns[modelIndex].name;\n\n    let group = columnHeaderGroups.find(({ children }) =>\n      children.includes(columnName)\n    );\n    while (group !== undefined && group.parent !== undefined) {\n      group = groupMap.get(group.parent);\n    }\n\n    const item = getTreeItem(\n      columns,\n      movedColumns,\n      groupMap,\n      group ? group.name : columnName,\n      userColumnWidths,\n      selectedItemsSet\n    );\n\n    items.push(item);\n\n    if (Array.isArray(item.data.visibleIndex)) {\n      visibleIndex += item.data.visibleIndex[1] - item.data.visibleIndex[0] + 1;\n    } else {\n      visibleIndex += 1;\n    }\n  }\n\n  return items;\n}\n\n/**\n * Gets the projected drop position and depth of the dragged item\n *\n * @param items List of flattened items\n * @param activeId ID of the actively dragged item\n * @param overId ID of the item currently being dragged over\n * @param dragOffset The x-axis offset of the dragged item\n * @param indentationWidth The width for each level of the tree\n * @returns The projected position and depth if the item were to be dropped\n */\nexport function getProjection(\n  items: FlattenedItem[],\n  activeId: string,\n  overId: string,\n  dragOffset: number,\n  indentationWidth: number\n) {\n  const overItemIndex = items.findIndex(({ id }) => id === overId);\n  const activeItemIndex = items.findIndex(({ id }) => id === activeId);\n  const activeItem = items[activeItemIndex];\n  const newItems = arrayMove(items, activeItemIndex, overItemIndex);\n  const previousItem: FlattenedItem | undefined = newItems[overItemIndex - 1];\n  const nextItem = newItems[overItemIndex + 1];\n  const dragDepth = getDragDepth(dragOffset, indentationWidth);\n  const projectedDepth = activeItem.depth + dragDepth;\n  const maxDepth = getMaxDepth({\n    previousItem,\n    nextItem,\n  });\n  const minDepth = getMinDepth({ nextItem });\n  let depth = projectedDepth;\n\n  if (projectedDepth >= maxDepth) {\n    depth = maxDepth;\n  } else if (projectedDepth < minDepth) {\n    depth = minDepth;\n  }\n\n  return { depth, maxDepth, minDepth, parentId: getParentId() };\n\n  function getParentId() {\n    if (depth === 0 || !previousItem) {\n      return null;\n    }\n\n    if (depth === previousItem.depth) {\n      return previousItem.parentId;\n    }\n\n    if (depth > previousItem.depth) {\n      return previousItem.id;\n    }\n\n    const newParent = newItems\n      .slice(0, overItemIndex)\n      .reverse()\n      .find(item => item.depth === depth)?.parentId;\n\n    return newParent ?? null;\n  }\n}\n\nfunction getMaxDepth({\n  previousItem,\n  nextItem,\n}: {\n  previousItem?: FlattenedItem;\n  nextItem?: FlattenedItem;\n}) {\n  return Math.max(previousItem?.depth ?? 0, nextItem?.depth ?? 0);\n}\n\nfunction getMinDepth({ nextItem }: { nextItem: FlattenedItem | undefined }) {\n  if (nextItem) {\n    return nextItem.depth;\n  }\n\n  return 0;\n}\n\n/**\n * Helper function to recursively flatten a tree\n *\n * @param items Items to flatten\n * @param parentId The current parentId of the items\n * @param depth The current depth of the items\n * @returns Flattened items\n */\nfunction flatten<T>(\n  items: TreeItems<T>,\n  parentId: string | null = null,\n  depth = 0\n): FlattenedItem<T>[] {\n  return items.reduce<FlattenedItem<T>[]>(\n    (acc, item, index) => [\n      ...acc,\n      { ...item, parentId, depth, index },\n      ...flatten(item.children, item.id, depth + 1),\n    ],\n    []\n  );\n}\n\n/**\n * Flattens a tree into a 1D array given the items\n * @param items The tree items to flatten\n * @returns The flattened tree items list\n */\nexport function flattenTree<T>(items: TreeItems<T>): FlattenedItem<T>[] {\n  // Should help prevent double flattening since FlattenedItems are valid TreeItems\n  if (items.every(isFlattenedTreeItem)) {\n    return items;\n  }\n  return flatten(items);\n}\n\n/**\n * Recursively checks for the item in a list of items.\n * The list does not have to be flattened prior to searching.\n *\n * @param items Items to search\n * @param itemId Item to find\n * @returns The item if found\n */\nexport function findItemDeep(\n  items: TreeItems,\n  itemId: string\n): TreeItem | undefined {\n  for (let i = 0; i < items.length; i += 1) {\n    const item = items[i];\n    const { id, children } = item;\n\n    if (id === itemId) {\n      return item;\n    }\n\n    if (children.length) {\n      const child = findItemDeep(children, itemId);\n\n      if (child) {\n        return child;\n      }\n    }\n  }\n\n  return undefined;\n}\n\nfunction countChildren(items: TreeItem[], count = 0): number {\n  return items.reduce((acc, { children }) => {\n    if (children.length) {\n      return countChildren(children, acc + 1);\n    }\n\n    return acc + 1;\n  }, count);\n}\n\nexport function getChildCount(items: TreeItems, id: string): number {\n  const item = findItemDeep(items, id);\n\n  return item ? countChildren(item.children) : 0;\n}\n\n/**\n * Removes the children of the list of parents from the list of flattened items\n *\n * @param items The flattened items to remove from\n * @param ids The parents we want to remove the children of\n * @returns The flattened items without the children of the parents\n */\nexport function removeChildrenOf<T>(\n  items: FlattenedItem<T>[],\n  ids: string[]\n): FlattenedItem<T>[] {\n  const excludeParentIds = new Set(ids);\n\n  return items.filter(item => {\n    if (item.parentId != null && excludeParentIds.has(item.parentId)) {\n      if (item.children.length) {\n        excludeParentIds.add(item.id);\n      }\n      return false;\n    }\n\n    return true;\n  });\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/iris-grid",
-  "version": "0.24.1-hierarchical-table.0+e16c3e0",
+  "version": "0.25.0",
   "description": "Deephaven Iris Grid",
   "author": "Deephaven Data Labs LLC",
   "license": "Apache-2.0",
@@ -23,17 +23,20 @@
     "build:sass": "sass --embed-sources --load-path=../../node_modules ./src:./dist"
   },
   "dependencies": {
-    "@deephaven/components": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/console": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/filters": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/grid": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/icons": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/jsapi-shim": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/jsapi-utils": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/log": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/react-hooks": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/storage": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/utils": "^0.24.1-hierarchical-table.0+e16c3e0",
+    "@deephaven/components": "^0.25.0",
+    "@deephaven/console": "^0.25.0",
+    "@deephaven/filters": "^0.25.0",
+    "@deephaven/grid": "^0.25.0",
+    "@deephaven/icons": "^0.25.0",
+    "@deephaven/jsapi-shim": "^0.25.0",
+    "@deephaven/jsapi-utils": "^0.25.0",
+    "@deephaven/log": "^0.25.0",
+    "@deephaven/react-hooks": "^0.25.0",
+    "@deephaven/storage": "^0.25.0",
+    "@deephaven/utils": "^0.25.0",
+    "@dnd-kit/core": "^6.0.5",
+    "@dnd-kit/sortable": "^7.0.0",
+    "@dnd-kit/utilities": "^3.2.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "classnames": "^2.3.1",
     "deep-equal": "^2.0.5",
@@ -50,11 +53,12 @@
     "web-streams-polyfill": "^2.1.0"
   },
   "peerDependencies": {
-    "react": "^17.x"
+    "react": "^17.x",
+    "react-dom": "^17.x"
   },
   "devDependencies": {
-    "@deephaven/mocks": "^0.24.1-hierarchical-table.0+e16c3e0",
-    "@deephaven/tsconfig": "^0.24.1-hierarchical-table.0+e16c3e0"
+    "@deephaven/mocks": "^0.25.0",
+    "@deephaven/tsconfig": "^0.25.0"
   },
   "files": [
     "dist"
@@ -65,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e16c3e06bff256387fe676e36aeeeac19e47ff5b"
+  "gitHead": "e8da34e9b99e4af6c485c4f714ae1dcd02a97e95"
 }

package/dist/sidebar/VisibilityOrderingBuilder.css

@@ -1,156 +0,0 @@
-/* stylelint-disable scss/at-import-no-partial-leading-underscore */
-.visibility-ordering-builder {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  max-height: 100%;
-  outline: 0;
-}
-.visibility-ordering-builder .top-menu {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  background-color: #2d2a2e;
-  padding: 0.25rem;
-  z-index: 2;
-}
-.visibility-ordering-builder .visibility-ordering-list {
-  overflow-y: auto;
-  flex-grow: 1;
-}
-.visibility-ordering-builder .visibility-ordering-list.isDragging {
-  background-image: linear-gradient(to right, #1a171a 50%, #f0f0ee 50%), linear-gradient(to right, #1a171a 50%, #f0f0ee 50%), linear-gradient(to bottom, #1a171a 50%, #f0f0ee 50%), linear-gradient(to bottom, #1a171a 50%, #f0f0ee 50%);
-  background-size: 8px 1px, 8px 1px, 1px 8px, 1px 8px;
-  background-position: 0 top, 0 bottom, left 0, right 0;
-  background-repeat: repeat-x, repeat-x, repeat-y, repeat-y;
-  animation: march 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-}
-.visibility-ordering-builder .visibility-ordering-list hr {
-  margin: 0.5rem 0;
-  background-color: #2d2a2e;
-}
-.visibility-ordering-builder .visibility-ordering-list-item {
-  display: flex;
-  flex-direction: row;
-  margin-bottom: 2px;
-  padding-left: 0.25rem;
-}
-.visibility-ordering-builder .visibility-ordering-list-item:first-child {
-  padding-top: 0.25rem;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .column-item {
-  border-radius: 4px;
-  display: flex;
-  justify-content: space-between;
-  padding: 0 0.5rem;
-  flex-grow: 2;
-  align-items: center;
-  user-select: none;
-  transition: color 0.12s ease-in-out, background-color 0.12s ease-in-out, border-color 0.12s ease-in-out, box-shadow 0.12s ease-in-out;
-  border: 1px solid transparent;
-  line-height: 1.5;
-  max-width: calc(100% - 1rem * 2);
-}
-.visibility-ordering-builder .visibility-ordering-list-item .column-item .column-name {
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  padding-right: 2px;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .column-item:focus {
-  outline: 0;
-  border: 1px solid rgba(72, 120, 234, 0.85);
-  box-shadow: 0 0 0 0.2rem rgba(72, 120, 234, 0.35);
-}
-.visibility-ordering-builder .visibility-ordering-list-item .column-item .fa-grip-vertical {
-  color: #929192;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .column-item:hover {
-  background: #5b5a5c;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .column-item:hover .fa-grip-vertical {
-  color: #f0f0ee;
-}
-.visibility-ordering-builder .visibility-ordering-list-item.immovable .column-item {
-  color: #929192;
-  padding-left: 32px;
-}
-.visibility-ordering-builder .visibility-ordering-list-item.immovable .column-item:hover {
-  background: transparent;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected {
-  background-color: rgba(72, 120, 234, 0.4);
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected:hover {
-  background-color: #4878ea;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected.isDragging {
-  opacity: 0.4;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected.isDragging.isDragged {
-  opacity: 1;
-  color: #f0f0ee;
-  background-color: #4878ea;
-  position: relative;
-  box-shadow: 0 0.1rem 1rem rgba(26, 23, 26, 0.45);
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected.isDragging.isDragged .fa-grip-vertical {
-  color: #f0f0ee;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected.isDragging.isDragged.two-dragged::before {
-  content: " ";
-  background: #4878ea;
-  box-shadow: 0 0.1rem 1rem rgba(26, 23, 26, 0.45);
-  border-radius: 4px;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  top: 4px;
-  left: 2px;
-  opacity: 0.8;
-  z-index: -1;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected.isDragging.isDragged.multiple-dragged::before {
-  content: " ";
-  background: #4878ea;
-  box-shadow: 0 0.1rem 1rem rgba(26, 23, 26, 0.45);
-  border-radius: 4px;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  top: 4px;
-  left: 2px;
-  opacity: 0.8;
-  z-index: -1;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .isSelected.isDragging.isDragged.multiple-dragged::after {
-  content: " ";
-  background: #4878ea;
-  box-shadow: 0 0.1rem 1rem rgba(26, 23, 26, 0.45);
-  border-radius: 4px;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  top: 8px;
-  left: 4px;
-  opacity: 0.6;
-  z-index: -2;
-}
-.visibility-ordering-builder .visibility-ordering-list-item .number-badge {
-  padding: 0 0.5rem;
-  border-radius: 1rem;
-  background-color: rgba(240, 240, 238, 0.25);
-  margin-right: 0.25rem;
-}
-.visibility-ordering-builder .vertical-divider {
-  border-left: 1px solid #1a171a;
-  padding-right: 0.25rem;
-  margin-left: 0.25rem;
-  height: 1rem;
-}
-.visibility-ordering-builder .list {
-  flex-grow: 2;
-}
-
-/*# sourceMappingURL=VisibilityOrderingBuilder.css.map */