@universal-ember/table 3.1.1 → 3.2.0

package/declarations/plugins/column-reordering/plugin.d.ts

@@ -90,7 +90,8 @@ export declare class TableMeta {
      * @private
      * This isn't our data to expose, but it is useful to alias
      */
-    private get availableColumns();
+    private get visibleColumns();
+    private get allColumns();
 }
 /**
  * @private
@@ -103,10 +104,47 @@ export declare class ColumnOrder {
      */
     map: TrackedMap<string, number>;
     constructor(args: {
+        /**
+         * All columns to track in the ordering.
+         *
+         * Backwards compatible usage (without ColumnVisibility):
+         * - Pass only the columns you want to display
+         * - All columns are treated as visible
+         *
+         * New usage (with ColumnVisibility):
+         * - Pass ALL columns (including hidden ones)
+         * - Provide `visibleColumns` to indicate which are visible
+         * - Hidden columns maintain their position when toggled
+         */
         columns: () => Column[];
+        /**
+         * Optional: Record of which columns are currently visible.
+         * When provided, moveLeft/moveRight will skip over hidden columns.
+         * When omitted, all columns from `columns` are treated as visible (backwards compatible).
+         *
+         * Example when using ColumnVisibility:
+         * ```ts
+         * visibleColumns: () => columns.reduce((acc, col) => {
+         *   acc[col.key] = meta(col).ColumnVisibility?.isVisible !== false;
+         *   return acc;
+         * }, {})
+         * ```
+         */
+        visibleColumns?: () => Record<string, boolean>;
+        /**
+         * Optional: Callback to persist the column order (e.g., to localStorage).
+         */
         save?: (order: Map<string, number>) => void;
+        /**
+         * Optional: Previously saved column order to restore.
+         */
         existingOrder?: Map<string, number>;
     });
+    /**
+     * @private
+     * Helper to get visible columns, defaulting to all columns if not specified
+     */
+    private getVisibleColumns;
     /**
      * To account for columnVisibilty, we need to:
      * - get the list of visible columns
@@ -139,7 +177,10 @@ export declare class ColumnOrder {
  * @private
  *
  * Utility for helping determine the percieved order of a set of columns
- * given the original (default) ordering, and then user-configurations
+ * given the original (default) ordering, and then user-configurations.
+ *
+ * This function adds missing columns but preserves extra columns in the map
+ * (they might be hidden, not deleted).
  */
 export declare function orderOf(columns: {
     key: string;

package/declarations/plugins/column-reordering/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/column-reordering/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/column-reordering/plugin.ts"],"names":[],"mappings":"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"}

package/dist/plugins/column-reordering/plugin.js

@@ -45,6 +45,8 @@ class ColumnMeta {
   get position() {
     return _classPrivateGetter(_ColumnMeta_brand, this, _get_tableMeta).getPosition(this.column);
   }
+
+  // Swaps this column with the column in the new position
   set position(value) {
     _classPrivateGetter(_ColumnMeta_brand, this, _get_tableMeta).setPosition(this.column, value);
   }
@@ -103,7 +105,8 @@ let TableMeta = (_class = class TableMeta {
   reset() {
     preferences.forTable(this.table, ColumnReordering).delete('order');
     this.columnOrder = new ColumnOrder({
-      columns: () => this.availableColumns,
+      columns: () => this.allColumns,
+      visibleColumns: () => this.visibleColumns,
       save: this.save
     });
   }
@@ -128,15 +131,21 @@ let TableMeta = (_class = class TableMeta {
     return new Map(Object.entries(order));
   }
   get columns() {
-    return this.columnOrder.orderedColumns;
+    return this.columnOrder.orderedColumns.filter(column => this.visibleColumns[column.key]);
   }
 
   /**
    * @private
    * This isn't our data to expose, but it is useful to alias
    */
-  get availableColumns() {
-    return columns.for(this.table, ColumnReordering);
+  get visibleColumns() {
+    return columns.for(this.table, ColumnReordering).reduce((acc, column) => {
+      acc[column.key] = true;
+      return acc;
+    }, {});
+  }
+  get allColumns() {
+    return this.table.columns.values();
   }
 }, _descriptor = _applyDecoratedDescriptor(_class.prototype, "columnOrder", [tracked], {
   configurable: true,
@@ -144,7 +153,8 @@ let TableMeta = (_class = class TableMeta {
   writable: true,
   initializer: function () {
     return new ColumnOrder({
-      columns: () => this.availableColumns,
+      columns: () => this.allColumns,
+      visibleColumns: () => this.visibleColumns,
       save: this.save,
       existingOrder: this.read()
     });
@@ -162,6 +172,9 @@ let ColumnOrder = (_class2 = class ColumnOrder {
      */
     _defineProperty(this, "map", new TrackedMap());
     _defineProperty(this, "setAll", map => {
+      let allColumns = this.args.columns();
+      addMissingColumnsToMap(allColumns, map);
+      removeExtraColumnsFromMap(allColumns, map);
       this.map.clear();
       for (const [key, value] of map.entries()) {
         this.map.set(key, value);
@@ -169,11 +182,33 @@ let ColumnOrder = (_class2 = class ColumnOrder {
       this.args.save?.(map);
     });
     this.args = args;
+    let _allColumns = this.args.columns();
     if (args.existingOrder) {
-      this.map = new TrackedMap(args.existingOrder);
+      let newOrder = new Map(args.existingOrder.entries());
+      addMissingColumnsToMap(_allColumns, newOrder);
+      removeExtraColumnsFromMap(_allColumns, newOrder);
+      this.map = new TrackedMap(newOrder);
+    } else {
+      this.map = new TrackedMap(_allColumns.map((column, i) => [column.key, i]));
     }
   }
 
+  /**
+   * @private
+   * Helper to get visible columns, defaulting to all columns if not specified
+   */
+  getVisibleColumns() {
+    if (this.args.visibleColumns) {
+      return this.args.visibleColumns();
+    }
+
+    // Default: all columns are visible
+    return this.args.columns().reduce((acc, col) => {
+      acc[col.key] = true;
+      return acc;
+    }, {});
+  }
+
   /**
    * To account for columnVisibilty, we need to:
    * - get the list of visible columns
@@ -183,20 +218,30 @@ let ColumnOrder = (_class2 = class ColumnOrder {
    */
   moveLeft(key) {
     const orderedColumns = this.orderedColumns;
+    if (this.map.get(key) === 0) {
+      return;
+    }
     let found = false;
-    let nextColumn;
     for (const column of orderedColumns.reverse()) {
       if (found) {
-        nextColumn = column;
-        break;
+        // Shift moved column left
+        let currentPosition = this.map.get(key);
+        assert('current key must exist in map', currentPosition !== undefined);
+        this.map.set(key, currentPosition - 1);
+
+        // Shift displayed column right
+        let displayedColumnPosition = this.map.get(column.key);
+        assert('displaced key must exist in map', displayedColumnPosition !== undefined);
+        this.map.set(column.key, displayedColumnPosition + 1);
+        if (this.getVisibleColumns()[column.key]) {
+          break;
+        }
       }
       if (column.key === key) {
         found = true;
       }
     }
-    if (!nextColumn) return;
-    const nextPosition = this.get(nextColumn.key);
-    this.swapWith(key, nextPosition);
+    this.args.save?.(this.map);
   }
   /**
    * To account for columnVisibilty, we need to:
@@ -208,19 +253,26 @@ let ColumnOrder = (_class2 = class ColumnOrder {
   moveRight(key) {
     const orderedColumns = this.orderedColumns;
     let found = false;
-    let nextColumn;
     for (const column of orderedColumns) {
       if (found) {
-        nextColumn = column;
-        break;
+        // Shift moved column right
+        let currentPosition = this.map.get(key);
+        assert('current key must exist in map', currentPosition !== undefined);
+        this.map.set(key, currentPosition + 1);
+
+        // Shift displaced column left
+        let displayedColumnPosition = this.map.get(column.key);
+        assert('displaced key must exist in map', displayedColumnPosition !== undefined);
+        this.map.set(column.key, displayedColumnPosition - 1);
+        if (this.getVisibleColumns()[column.key]) {
+          break;
+        }
       }
       if (column.key === key) {
         found = true;
       }
     }
-    if (!nextColumn) return;
-    const nextPosition = this.get(nextColumn.key);
-    this.swapWith(key, nextPosition);
+    this.args.save?.(this.map);
   }
 
   /**
@@ -241,7 +293,7 @@ let ColumnOrder = (_class2 = class ColumnOrder {
      * by reading orderedMap
      */
     const currentPosition = this.orderedMap.get(key);
-    assert(`Pre-existing position for ${key} could not be found. Does the column exist? ` + `The current positions are: ` + [...this.orderedMap.entries()].map(entry => entry.join(' => ')).join(', ') + ` and the availableColumns are: ` + this.args.columns().map(column => column.key).join(', ') + ` and current "map" (${this.map.size}) is: ` + [...this.map.entries()].map(entry => entry.join(' => ')).join(', '), undefined !== currentPosition);
+    assert(`Pre-existing position for ${key} could not be found. Does the column exist? ` + `The current positions are: ` + [...this.orderedMap.entries()].map(entry => entry.join(' => ')).join(', ') + ` and the visibleColumns are: ` + Object.keys(this.getVisibleColumns()).join(', ') + ` and current "map" (${this.map.size}) is: ` + [...this.map.entries()].map(entry => entry.join(' => ')).join(', '), undefined !== currentPosition);
 
     /**
      * No need to change anything if the position is the same
@@ -291,21 +343,21 @@ let ColumnOrder = (_class2 = class ColumnOrder {
     return orderOf(this.args.columns(), this.map);
   }
   get orderedColumns() {
-    const availableColumns = this.args.columns();
-    const availableByKey = availableColumns.reduce((keyMap, column) => {
+    const allColumns = this.args.columns();
+    const columnsByKey = allColumns.reduce((keyMap, column) => {
       keyMap[column.key] = column;
       return keyMap;
     }, {});
-    const mergedOrder = orderOf(availableColumns, this.map);
+    const mergedOrder = orderOf(allColumns, this.map);
     const result = Array.from({
-      length: availableColumns.length
+      length: allColumns.length
     });
     for (const [key, position] of mergedOrder.entries()) {
-      const column = availableByKey[key];
+      const column = columnsByKey[key];
       assert(`Could not find column for pair: ${key} @ @{position}`, column);
       result[position] = column;
     }
-    assert(`Generated orderedColumns' length (${result.filter(Boolean).length}) ` + `does not match the length of available columns (${availableColumns.length}). ` + `orderedColumns: ${result.filter(Boolean).map(c => c.key).join(', ')} -- ` + `available columns: ${availableColumns.map(c => c.key).join(', ')}`, result.filter(Boolean).length === availableColumns.length);
+    assert(`Generated orderedColumns' length (${result.filter(Boolean).length}) ` + `does not match the length of all columns (${allColumns.length}). ` + `orderedColumns: ${result.filter(Boolean).map(c => c.key).join(', ')} -- ` + `all columns: ${allColumns.map(c => c.key).join(', ')}`, result.filter(Boolean).length === allColumns.length);
     return result.filter(Boolean);
   }
 }, _applyDecoratedDescriptor(_class2.prototype, "moveLeft", [action], Object.getOwnPropertyDescriptor(_class2.prototype, "moveLeft"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "moveRight", [action], Object.getOwnPropertyDescriptor(_class2.prototype, "moveRight"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "swapWith", [action], Object.getOwnPropertyDescriptor(_class2.prototype, "swapWith"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "get", [action], Object.getOwnPropertyDescriptor(_class2.prototype, "get"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "orderedMap", [cached], Object.getOwnPropertyDescriptor(_class2.prototype, "orderedMap"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "orderedColumns", [cached], Object.getOwnPropertyDescriptor(_class2.prototype, "orderedColumns"), _class2.prototype), _class2);
@@ -314,45 +366,74 @@ let ColumnOrder = (_class2 = class ColumnOrder {
  * @private
  *
  * Utility for helping determine the percieved order of a set of columns
- * given the original (default) ordering, and then user-configurations
+ * given the original (default) ordering, and then user-configurations.
+ *
+ * This function adds missing columns but preserves extra columns in the map
+ * (they might be hidden, not deleted).
  */
 function orderOf(columns, currentOrder) {
-  const result = new Map();
-  const availableColumns = columns.map(column => column.key);
-  const availableSet = new Set(availableColumns);
-  const current = new Map([...currentOrder.entries()].map(([key, position]) => [position, key]));
+  // Create a copy to avoid mutating the input
+  let workingOrder = new Map(currentOrder);
 
-  /**
-   * O(n * log(n)) ?
-   */
-  for (let i = 0; i < Math.max(columns.length, current.size); i++) {
-    const orderedKey = current.get(i);
-    if (orderedKey) {
-      /**
-       * If the currentOrder specifies columns not presently available,
-       * ignore them
-       */
-      if (availableSet.has(orderedKey)) {
-        result.set(orderedKey, i);
-        continue;
-      }
-    }
-    let availableKey;
-    while (availableKey = availableColumns.shift()) {
-      if (result.has(availableKey) || currentOrder.has(availableKey)) {
-        continue;
+  // Add any missing columns to the end
+  addMissingColumnsToMap(columns, workingOrder);
+
+  // DON'T remove extra columns - they might be hidden columns, not deleted ones
+  // The ColumnOrder constructor handles removal of truly deleted columns
+
+  // Ensure positions are consecutive and zero based
+  let inOrder = Array.from(workingOrder.entries()).sort(([_keyA, positionA], [_keyB, positionB]) => positionA - positionB);
+  let orderedColumns = new Map();
+  let position = 0;
+  for (let [key] of inOrder) {
+    orderedColumns.set(key, position++);
+  }
+  return orderedColumns;
+}
+
+/**
+ * @private
+ *
+ * Utility to add any missing columns to the position map. By calling this whenever
+ * data is passed in to the system we can simplify the code within the system because
+ * we know we are dealing with a full set of positions.
+ *
+ * @param columns - A list of all columns available to the table
+ * @param map - A Map of `key` to position (as a zero based integer)
+ */
+function addMissingColumnsToMap(columns, map) {
+  if (map.size < columns.length) {
+    let maxAssignedColumn = Math.max(...map.values());
+    for (let column of columns) {
+      if (map.get(column.key) === undefined) {
+        map.set(column.key, ++maxAssignedColumn);
       }
-      break;
     }
-    if (!availableKey) {
-      /**
-       * The rest of our columns likely have their order set
-       */
-      continue;
+  }
+}
+
+/**
+ * @private
+ *
+ * Utility to remove any extra columns from the position map. By calling this whenever
+ * data is passed in to the system we can simplify the code within the system because
+ * we know we are dealing with a full set of positions.
+ *
+ * @param columns - A list of all columns available to the table
+ * @param map - A Map of `key` to position (as a zero based integer)
+ */
+function removeExtraColumnsFromMap(columns, map) {
+  let columnsLookup = columns.reduce(function (acc, {
+    key
+  }) {
+    acc[key] = true;
+    return acc;
+  }, {});
+  for (let key of map.keys()) {
+    if (!columnsLookup[key]) {
+      map.delete(key);
     }
-    result.set(availableKey, i);
   }
-  return result;
 }
 
 export { ColumnMeta, ColumnOrder, ColumnReordering, TableMeta, orderOf };

package/dist/plugins/column-reordering/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../../src/plugins/column-reordering/plugin.ts"],"sourcesContent":["import { cached, tracked } from '@glimmer/tracking';\nimport { assert } from '@ember/debug';\nimport { action } from '@ember/object';\n\nimport { TrackedMap } from 'tracked-built-ins';\n\nimport { preferences } from '../../plugins/index.ts';\n\nimport { BasePlugin, columns, meta } from '../-private/base.ts';\n\nimport type { PluginPreferences } from '../../plugins/index.ts';\nimport type { Column, Table } from '../../index.ts';\n\ninterface ColumnReorderingPreferences extends PluginPreferences {\n  table: {\n    order?: Record<string, number>;\n  };\n}\n\ndeclare module '@universal-ember/table/plugins' {\n  interface Registry {\n    ColumnReordering?: ColumnReorderingPreferences;\n    'column-reordering'?: ColumnReorderingPreferences;\n  }\n}\n\nexport interface Signature {\n  Meta: {\n    Column: ColumnMeta;\n    Table: TableMeta;\n  };\n}\n\nexport class ColumnReordering extends BasePlugin<Signature> {\n  name = 'column-reordering';\n  static features = ['columnOrder'];\n\n  meta = {\n    column: ColumnMeta,\n    table: TableMeta,\n  } as const;\n\n  reset() {\n    const tableMeta = meta.forTable(this.table, ColumnReordering);\n\n    tableMeta.reset();\n  }\n\n  get columns() {\n    return meta.forTable(this.table, ColumnReordering).columns;\n  }\n}\n\nexport class ColumnMeta {\n  constructor(private column: Column) {}\n\n  get #tableMeta() {\n    return meta.forTable(this.column.table, ColumnReordering);\n  }\n\n  get position() {\n    return this.#tableMeta.getPosition(this.column);\n  }\n\n  set position(value: number) {\n    this.#tableMeta.setPosition(this.column, value);\n  }\n\n  get canMoveLeft() {\n    return this.#tableMeta.getPosition(this.column) !== 0;\n  }\n\n  get canMoveRight() {\n    return (\n      this.#tableMeta.getPosition(this.column) !==\n      this.#tableMeta.columns.length - 1\n    );\n  }\n\n  get cannotMoveLeft() {\n    return !this.canMoveLeft;\n  }\n\n  get cannotMoveRight() {\n    return !this.canMoveRight;\n  }\n\n  /**\n   * Move the column one spot to the left\n   */\n  moveLeft = () => {\n    this.#tableMeta.columnOrder.moveLeft(this.column.key);\n  };\n\n  /**\n   * Move the column one spot to the right\n   */\n  moveRight = () => {\n    this.#tableMeta.columnOrder.moveRight(this.column.key);\n  };\n}\n\nexport class TableMeta {\n  constructor(private table: Table) {}\n\n  /**\n   * @private\n   *\n   * We want to maintain the instance of this ColumnOrder class because\n   * we allow the consumer of the table to swap out columns at any time.\n   * When they do this, we want to maintain the order of the table, best we can.\n   * This is also why the order of the columns is maintained via column key\n   */\n  @tracked\n  columnOrder = new ColumnOrder({\n    columns: () => this.availableColumns,\n    save: this.save,\n    existingOrder: this.read(),\n  });\n\n  /**\n   * Get the curret order/position of a column\n   */\n  @action\n  getPosition<DataType = unknown>(column: Column<DataType>) {\n    return this.columnOrder.get(column.key);\n  }\n\n  /**\n   * Swap the column with the column at `newPosition`\n   */\n  @action\n  setPosition<DataType = unknown>(\n    column: Column<DataType>,\n    newPosition: number,\n  ) {\n    return this.columnOrder.swapWith(column.key, newPosition);\n  }\n\n  /**\n   * Using a `ColumnOrder` instance, set the order of all columns\n   */\n  setOrder = (order: ColumnOrder) => {\n    this.columnOrder.setAll(order.map);\n  };\n\n  /**\n   * Revert to default config, delete preferences,\n   * and clear the columnOrder\n   */\n  @action\n  reset() {\n    preferences.forTable(this.table, ColumnReordering).delete('order');\n    this.columnOrder = new ColumnOrder({\n      columns: () => this.availableColumns,\n      save: this.save,\n    });\n  }\n\n  /**\n   * @private\n   */\n  @action\n  save(map: Map<string, number>) {\n    const order: Record<string, number> = {};\n\n    for (const [key, position] of map.entries()) {\n      order[key] = position;\n    }\n\n    preferences.forTable(this.table, ColumnReordering).set('order', order);\n  }\n\n  /**\n   * @private\n   */\n  @action\n  private read() {\n    const order = preferences\n      .forTable(this.table, ColumnReordering)\n      .get('order');\n\n    if (!order) return;\n\n    return new Map<string, number>(Object.entries(order));\n  }\n\n  get columns() {\n    return this.columnOrder.orderedColumns;\n  }\n\n  /**\n   * @private\n   * This isn't our data to expose, but it is useful to alias\n   */\n  private get availableColumns() {\n    return columns.for(this.table, ColumnReordering);\n  }\n}\n\n/**\n * @private\n * Used for keeping track of and updating column order\n */\nexport class ColumnOrder {\n  /**\n   * This map will be empty until we re-order something.\n   */\n  map = new TrackedMap<string, number>();\n\n  constructor(\n    private args: {\n      columns: () => Column[];\n      save?: (order: Map<string, number>) => void;\n      existingOrder?: Map<string, number>;\n    },\n  ) {\n    if (args.existingOrder) {\n      this.map = new TrackedMap(args.existingOrder);\n    }\n  }\n\n  /**\n   * To account for columnVisibilty, we need to:\n   * - get the list of visible columns\n   * - get the column order (which preserves the order of hidden columns)\n   * - skip over non-visible columns when determining the previous \"index\"\n   * - set the position to whatever that is.\n   */\n  @action\n  moveLeft(key: string) {\n    const orderedColumns = this.orderedColumns;\n\n    let found = false;\n    let nextColumn: { key: string } | undefined;\n\n    for (const column of orderedColumns.reverse()) {\n      if (found) {\n        nextColumn = column;\n\n        break;\n      }\n\n      if (column.key === key) {\n        found = true;\n      }\n    }\n\n    if (!nextColumn) return;\n\n    const nextPosition = this.get(nextColumn.key);\n\n    this.swapWith(key, nextPosition);\n  }\n\n  setAll = (map: Map<string, number>) => {\n    this.map.clear();\n\n    for (const [key, value] of map.entries()) {\n      this.map.set(key, value);\n    }\n\n    this.args.save?.(map);\n  };\n\n  /**\n   * To account for columnVisibilty, we need to:\n   * - get the list of visible columns\n   * - get the column order (which preserves the order of hidden columns)\n   * - skip over non-visible columns when determining the next \"index\"\n   * - set the position to whatever that is.\n   */\n  @action\n  moveRight(key: string) {\n    const orderedColumns = this.orderedColumns;\n\n    let found = false;\n    let nextColumn: { key: string } | undefined;\n\n    for (const column of orderedColumns) {\n      if (found) {\n        nextColumn = column;\n\n        break;\n      }\n\n      if (column.key === key) {\n        found = true;\n      }\n    }\n\n    if (!nextColumn) return;\n\n    const nextPosition = this.get(nextColumn.key);\n\n    this.swapWith(key, nextPosition);\n  }\n\n  /**\n   * Performs a swap of the column's position with the column at position\n   */\n  @action\n  swapWith(key: string, position: number) {\n    const validPositions = [...this.orderedMap.values()];\n\n    /**\n     * Position to swap to must exist\n     */\n    if (!validPositions.includes(position)) {\n      return;\n    }\n\n    /**\n     * Where did this column `key` come from? we can find out\n     * by reading orderedMap\n     */\n    const currentPosition = this.orderedMap.get(key);\n\n    assert(\n      `Pre-existing position for ${key} could not be found. Does the column exist? ` +\n        `The current positions are: ` +\n        [...this.orderedMap.entries()]\n          .map((entry) => entry.join(' => '))\n          .join(', ') +\n        ` and the availableColumns are: ` +\n        this.args\n          .columns()\n          .map((column) => column.key)\n          .join(', ') +\n        ` and current \"map\" (${this.map.size}) is: ` +\n        [...this.map.entries()].map((entry) => entry.join(' => ')).join(', '),\n      undefined !== currentPosition,\n    );\n\n    /**\n     * No need to change anything if the position is the same\n     * This helps reduce @tracked invalidations, which in turn reduces DOM thrashing.\n     */\n    if (currentPosition === position) {\n      return false;\n    }\n\n    const keyByPosition = new Map<number, string>(\n      [...this.orderedMap.entries()].map(\n        (entry) => entry.reverse() as [number, string],\n      ),\n    );\n\n    for (const [existingPosition, key] of keyByPosition.entries()) {\n      if (existingPosition === position) {\n        /**\n         * We swap positions because the positions are not incremental\n         * meaning we can have gaps, intentionally, due to hidden columns\n         */\n        this.map.set(key, currentPosition);\n\n        break;\n      }\n    }\n\n    /**\n     * Finally, set the position for the requested column\n     */\n    this.map.set(key, position);\n\n    /**\n     * Now that we've set the value for one column,\n     * we need to make sure that all columns have a recorded position.\n     */\n    for (const [key, position] of this.orderedMap.entries()) {\n      if (this.map.has(key)) continue;\n\n      this.map.set(key, position);\n    }\n\n    this.args.save?.(this.map);\n  }\n\n  @action\n  get(key: string) {\n    const result = this.orderedMap.get(key);\n\n    assert(\n      `No position found for ${key}. Is the column used within this table?`,\n      /* 0 is falsey, but it's a valid value for position */\n      undefined !== result,\n    );\n\n    return result;\n  }\n\n  /**\n   * The same as this.map, but with all the columns' information\n   */\n  @cached\n  get orderedMap(): ReadonlyMap<string, number> {\n    return orderOf(this.args.columns(), this.map);\n  }\n\n  @cached\n  get orderedColumns(): Column[] {\n    const availableColumns = this.args.columns();\n    const availableByKey = availableColumns.reduce(\n      (keyMap, column) => {\n        keyMap[column.key] = column;\n\n        return keyMap;\n      },\n      {} as Record<string, Column>,\n    );\n    const mergedOrder = orderOf(availableColumns, this.map);\n\n    const result: Column[] = Array.from({ length: availableColumns.length });\n\n    for (const [key, position] of mergedOrder.entries()) {\n      const column = availableByKey[key];\n\n      assert(`Could not find column for pair: ${key} @ @{position}`, column);\n      result[position] = column;\n    }\n\n    assert(\n      `Generated orderedColumns' length (${result.filter(Boolean).length}) ` +\n        `does not match the length of available columns (${availableColumns.length}). ` +\n        `orderedColumns: ${result\n          .filter(Boolean)\n          .map((c) => c.key)\n          .join(', ')} -- ` +\n        `available columns: ${availableColumns.map((c) => c.key).join(', ')}`,\n      result.filter(Boolean).length === availableColumns.length,\n    );\n\n    return result.filter(Boolean);\n  }\n}\n\n/**\n * @private\n *\n * Utility for helping determine the percieved order of a set of columns\n * given the original (default) ordering, and then user-configurations\n */\nexport function orderOf(\n  columns: { key: string }[],\n  currentOrder: Map<string, number>,\n): Map<string, number> {\n  const result = new Map<string, number>();\n  const availableColumns = columns.map((column) => column.key);\n  const availableSet = new Set(availableColumns);\n  const current = new Map<number, string>(\n    [...currentOrder.entries()].map(([key, position]) => [position, key]),\n  );\n\n  /**\n   * O(n * log(n)) ?\n   */\n  for (let i = 0; i < Math.max(columns.length, current.size); i++) {\n    const orderedKey = current.get(i);\n\n    if (orderedKey) {\n      /**\n       * If the currentOrder specifies columns not presently available,\n       * ignore them\n       */\n      if (availableSet.has(orderedKey)) {\n        result.set(orderedKey, i);\n        continue;\n      }\n    }\n\n    let availableKey: string | undefined;\n\n    while ((availableKey = availableColumns.shift())) {\n      if (result.has(availableKey) || currentOrder.has(availableKey)) {\n        continue;\n      }\n\n      break;\n    }\n\n    if (!availableKey) {\n      /**\n       * The rest of our columns likely have their order set\n       */\n      continue;\n    }\n\n    result.set(availableKey, i);\n  }\n\n  return result;\n}\n"],"names":["ColumnReordering","BasePlugin","constructor","args","_defineProperty","column","ColumnMeta","table","TableMeta","reset","tableMeta","meta","forTable","columns","_ColumnMeta_brand","WeakSet","_classPrivateMethodInitSpec","_classPrivateGetter","_get_tableMeta","columnOrder","moveLeft","key","moveRight","position","getPosition","value","setPosition","canMoveLeft","canMoveRight","length","cannotMoveLeft","cannotMoveRight","_this","_class","_initializerDefineProperty","_descriptor","order","setAll","map","get","newPosition","swapWith","preferences","delete","ColumnOrder","availableColumns","save","entries","set","read","Map","Object","orderedColumns","for","_applyDecoratedDescriptor","prototype","tracked","configurable","enumerable","writable","initializer","existingOrder","action","getOwnPropertyDescriptor","_class2","TrackedMap","clear","found","nextColumn","reverse","nextPosition","validPositions","orderedMap","values","includes","currentPosition","assert","entry","join","size","undefined","keyByPosition","existingPosition","has","result","orderOf","availableByKey","reduce","keyMap","mergedOrder","Array","from","filter","Boolean","c","cached","currentOrder","availableSet","Set","current","i","Math","max","orderedKey","availableKey","shift"],"mappings":"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"}
+{"version":3,"file":"plugin.js","sources":["../../../src/plugins/column-reordering/plugin.ts"],"sourcesContent":["import { cached, tracked } from '@glimmer/tracking';\nimport { assert } from '@ember/debug';\nimport { action } from '@ember/object';\n\nimport { TrackedMap } from 'tracked-built-ins';\n\nimport { preferences } from '../../plugins/index.ts';\n\nimport { BasePlugin, columns, meta } from '../-private/base.ts';\n\nimport type { PluginPreferences } from '../../plugins/index.ts';\nimport type { Column, Table } from '../../index.ts';\n\ninterface ColumnReorderingPreferences extends PluginPreferences {\n  table: {\n    order?: Record<string, number>;\n  };\n}\n\ndeclare module '@universal-ember/table/plugins' {\n  interface Registry {\n    ColumnReordering?: ColumnReorderingPreferences;\n    'column-reordering'?: ColumnReorderingPreferences;\n  }\n}\n\nexport interface Signature {\n  Meta: {\n    Column: ColumnMeta;\n    Table: TableMeta;\n  };\n}\n\nexport class ColumnReordering extends BasePlugin<Signature> {\n  name = 'column-reordering';\n  static features = ['columnOrder'];\n\n  meta = {\n    column: ColumnMeta,\n    table: TableMeta,\n  } as const;\n\n  reset() {\n    const tableMeta = meta.forTable(this.table, ColumnReordering);\n\n    tableMeta.reset();\n  }\n\n  get columns() {\n    return meta.forTable(this.table, ColumnReordering).columns;\n  }\n}\n\nexport class ColumnMeta {\n  constructor(private column: Column) {}\n\n  get #tableMeta() {\n    return meta.forTable(this.column.table, ColumnReordering);\n  }\n\n  get position() {\n    return this.#tableMeta.getPosition(this.column);\n  }\n\n  // Swaps this column with the column in the new position\n  set position(value: number) {\n    this.#tableMeta.setPosition(this.column, value);\n  }\n\n  get canMoveLeft() {\n    return this.#tableMeta.getPosition(this.column) !== 0;\n  }\n\n  get canMoveRight() {\n    return (\n      this.#tableMeta.getPosition(this.column) !==\n      this.#tableMeta.columns.length - 1\n    );\n  }\n\n  get cannotMoveLeft() {\n    return !this.canMoveLeft;\n  }\n\n  get cannotMoveRight() {\n    return !this.canMoveRight;\n  }\n\n  /**\n   * Move the column one spot to the left\n   */\n  moveLeft = () => {\n    this.#tableMeta.columnOrder.moveLeft(this.column.key);\n  };\n\n  /**\n   * Move the column one spot to the right\n   */\n  moveRight = () => {\n    this.#tableMeta.columnOrder.moveRight(this.column.key);\n  };\n}\n\nexport class TableMeta {\n  constructor(private table: Table) {}\n\n  /**\n   * @private\n   *\n   * We want to maintain the instance of this ColumnOrder class because\n   * we allow the consumer of the table to swap out columns at any time.\n   * When they do this, we want to maintain the order of the table, best we can.\n   * This is also why the order of the columns is maintained via column key\n   */\n  @tracked\n  columnOrder = new ColumnOrder({\n    columns: () => this.allColumns,\n    visibleColumns: () => this.visibleColumns,\n    save: this.save,\n    existingOrder: this.read(),\n  });\n\n  /**\n   * Get the curret order/position of a column\n   */\n  @action\n  getPosition<DataType = unknown>(column: Column<DataType>) {\n    return this.columnOrder.get(column.key);\n  }\n\n  /**\n   * Swap the column with the column at `newPosition`\n   */\n  @action\n  setPosition<DataType = unknown>(\n    column: Column<DataType>,\n    newPosition: number,\n  ) {\n    return this.columnOrder.swapWith(column.key, newPosition);\n  }\n\n  /**\n   * Using a `ColumnOrder` instance, set the order of all columns\n   */\n  setOrder = (order: ColumnOrder) => {\n    this.columnOrder.setAll(order.map);\n  };\n\n  /**\n   * Revert to default config, delete preferences,\n   * and clear the columnOrder\n   */\n  @action\n  reset() {\n    preferences.forTable(this.table, ColumnReordering).delete('order');\n    this.columnOrder = new ColumnOrder({\n      columns: () => this.allColumns,\n      visibleColumns: () => this.visibleColumns,\n      save: this.save,\n    });\n  }\n\n  /**\n   * @private\n   */\n  @action\n  save(map: Map<string, number>) {\n    const order: Record<string, number> = {};\n\n    for (const [key, position] of map.entries()) {\n      order[key] = position;\n    }\n\n    preferences.forTable(this.table, ColumnReordering).set('order', order);\n  }\n\n  /**\n   * @private\n   */\n  @action\n  private read() {\n    const order = preferences\n      .forTable(this.table, ColumnReordering)\n      .get('order');\n\n    if (!order) return;\n\n    return new Map<string, number>(Object.entries(order));\n  }\n\n  get columns() {\n    return this.columnOrder.orderedColumns.filter(\n      (column) => this.visibleColumns[column.key],\n    );\n  }\n\n  /**\n   * @private\n   * This isn't our data to expose, but it is useful to alias\n   */\n  private get visibleColumns() {\n    return columns\n      .for(this.table, ColumnReordering)\n      .reduce<Record<string, boolean>>((acc, column) => {\n        acc[column.key] = true;\n\n        return acc;\n      }, {});\n  }\n\n  private get allColumns() {\n    return this.table.columns.values();\n  }\n}\n\n/**\n * @private\n * Used for keeping track of and updating column order\n */\nexport class ColumnOrder {\n  /**\n   * This map will be empty until we re-order something.\n   */\n  map = new TrackedMap<string, number>();\n\n  constructor(\n    private args: {\n      /**\n       * All columns to track in the ordering.\n       *\n       * Backwards compatible usage (without ColumnVisibility):\n       * - Pass only the columns you want to display\n       * - All columns are treated as visible\n       *\n       * New usage (with ColumnVisibility):\n       * - Pass ALL columns (including hidden ones)\n       * - Provide `visibleColumns` to indicate which are visible\n       * - Hidden columns maintain their position when toggled\n       */\n      columns: () => Column[];\n      /**\n       * Optional: Record of which columns are currently visible.\n       * When provided, moveLeft/moveRight will skip over hidden columns.\n       * When omitted, all columns from `columns` are treated as visible (backwards compatible).\n       *\n       * Example when using ColumnVisibility:\n       * ```ts\n       * visibleColumns: () => columns.reduce((acc, col) => {\n       *   acc[col.key] = meta(col).ColumnVisibility?.isVisible !== false;\n       *   return acc;\n       * }, {})\n       * ```\n       */\n      visibleColumns?: () => Record<string, boolean>;\n      /**\n       * Optional: Callback to persist the column order (e.g., to localStorage).\n       */\n      save?: (order: Map<string, number>) => void;\n      /**\n       * Optional: Previously saved column order to restore.\n       */\n      existingOrder?: Map<string, number>;\n    },\n  ) {\n    let allColumns = this.args.columns();\n\n    if (args.existingOrder) {\n      let newOrder = new Map(args.existingOrder.entries());\n\n      addMissingColumnsToMap(allColumns, newOrder);\n      removeExtraColumnsFromMap(allColumns, newOrder);\n      this.map = new TrackedMap(newOrder);\n    } else {\n      this.map = new TrackedMap(allColumns.map((column, i) => [column.key, i]));\n    }\n  }\n\n  /**\n   * @private\n   * Helper to get visible columns, defaulting to all columns if not specified\n   */\n  private getVisibleColumns(): Record<string, boolean> {\n    if (this.args.visibleColumns) {\n      return this.args.visibleColumns();\n    }\n\n    // Default: all columns are visible\n    return this.args.columns().reduce(\n      (acc, col) => {\n        acc[col.key] = true;\n        return acc;\n      },\n      {} as Record<string, boolean>,\n    );\n  }\n\n  /**\n   * To account for columnVisibilty, we need to:\n   * - get the list of visible columns\n   * - get the column order (which preserves the order of hidden columns)\n   * - skip over non-visible columns when determining the previous \"index\"\n   * - set the position to whatever that is.\n   */\n  @action\n  moveLeft(key: string) {\n    const orderedColumns = this.orderedColumns;\n    if (this.map.get(key) === 0) {\n      return;\n    }\n\n    let found = false;\n\n    for (const column of orderedColumns.reverse()) {\n      if (found) {\n        // Shift moved column left\n        let currentPosition = this.map.get(key);\n\n        assert('current key must exist in map', currentPosition !== undefined);\n        this.map.set(key, currentPosition - 1);\n\n        // Shift displayed column right\n        let displayedColumnPosition = this.map.get(column.key);\n\n        assert(\n          'displaced key must exist in map',\n          displayedColumnPosition !== undefined,\n        );\n        this.map.set(column.key, displayedColumnPosition + 1);\n\n        if (this.getVisibleColumns()[column.key]) {\n          break;\n        }\n      }\n\n      if (column.key === key) {\n        found = true;\n      }\n    }\n\n    this.args.save?.(this.map);\n  }\n\n  setAll = (map: Map<string, number>) => {\n    let allColumns = this.args.columns();\n\n    addMissingColumnsToMap(allColumns, map);\n    removeExtraColumnsFromMap(allColumns, map);\n\n    this.map.clear();\n\n    for (const [key, value] of map.entries()) {\n      this.map.set(key, value);\n    }\n\n    this.args.save?.(map);\n  };\n\n  /**\n   * To account for columnVisibilty, we need to:\n   * - get the list of visible columns\n   * - get the column order (which preserves the order of hidden columns)\n   * - skip over non-visible columns when determining the next \"index\"\n   * - set the position to whatever that is.\n   */\n  @action\n  moveRight(key: string) {\n    const orderedColumns = this.orderedColumns;\n    let found = false;\n\n    for (const column of orderedColumns) {\n      if (found) {\n        // Shift moved column right\n        let currentPosition = this.map.get(key);\n\n        assert('current key must exist in map', currentPosition !== undefined);\n        this.map.set(key, currentPosition + 1);\n\n        // Shift displaced column left\n        let displayedColumnPosition = this.map.get(column.key);\n\n        assert(\n          'displaced key must exist in map',\n          displayedColumnPosition !== undefined,\n        );\n        this.map.set(column.key, displayedColumnPosition - 1);\n\n        if (this.getVisibleColumns()[column.key]) {\n          break;\n        }\n      }\n\n      if (column.key === key) {\n        found = true;\n      }\n    }\n\n    this.args.save?.(this.map);\n  }\n\n  /**\n   * Performs a swap of the column's position with the column at position\n   */\n  @action\n  swapWith(key: string, position: number) {\n    const validPositions = [...this.orderedMap.values()];\n\n    /**\n     * Position to swap to must exist\n     */\n    if (!validPositions.includes(position)) {\n      return;\n    }\n\n    /**\n     * Where did this column `key` come from? we can find out\n     * by reading orderedMap\n     */\n    const currentPosition = this.orderedMap.get(key);\n\n    assert(\n      `Pre-existing position for ${key} could not be found. Does the column exist? ` +\n        `The current positions are: ` +\n        [...this.orderedMap.entries()]\n          .map((entry) => entry.join(' => '))\n          .join(', ') +\n        ` and the visibleColumns are: ` +\n        Object.keys(this.getVisibleColumns()).join(', ') +\n        ` and current \"map\" (${this.map.size}) is: ` +\n        [...this.map.entries()].map((entry) => entry.join(' => ')).join(', '),\n      undefined !== currentPosition,\n    );\n\n    /**\n     * No need to change anything if the position is the same\n     * This helps reduce @tracked invalidations, which in turn reduces DOM thrashing.\n     */\n    if (currentPosition === position) {\n      return false;\n    }\n\n    const keyByPosition = new Map<number, string>(\n      [...this.orderedMap.entries()].map(\n        (entry) => entry.reverse() as [number, string],\n      ),\n    );\n\n    for (const [existingPosition, key] of keyByPosition.entries()) {\n      if (existingPosition === position) {\n        /**\n         * We swap positions because the positions are not incremental\n         * meaning we can have gaps, intentionally, due to hidden columns\n         */\n        this.map.set(key, currentPosition);\n\n        break;\n      }\n    }\n\n    /**\n     * Finally, set the position for the requested column\n     */\n    this.map.set(key, position);\n\n    /**\n     * Now that we've set the value for one column,\n     * we need to make sure that all columns have a recorded position.\n     */\n    for (const [key, position] of this.orderedMap.entries()) {\n      if (this.map.has(key)) continue;\n\n      this.map.set(key, position);\n    }\n\n    this.args.save?.(this.map);\n  }\n\n  @action\n  get(key: string) {\n    const result = this.orderedMap.get(key);\n\n    assert(\n      `No position found for ${key}. Is the column used within this table?`,\n      /* 0 is falsey, but it's a valid value for position */\n      undefined !== result,\n    );\n\n    return result;\n  }\n\n  /**\n   * The same as this.map, but with all the columns' information\n   */\n  @cached\n  get orderedMap(): ReadonlyMap<string, number> {\n    return orderOf(this.args.columns(), this.map);\n  }\n\n  @cached\n  get orderedColumns(): Column[] {\n    const allColumns = this.args.columns();\n    const columnsByKey = allColumns.reduce(\n      (keyMap, column) => {\n        keyMap[column.key] = column;\n        return keyMap;\n      },\n      {} as Record<string, Column>,\n    );\n    const mergedOrder = orderOf(allColumns, this.map);\n\n    const result: Column[] = Array.from({ length: allColumns.length });\n\n    for (const [key, position] of mergedOrder.entries()) {\n      const column = columnsByKey[key];\n\n      assert(`Could not find column for pair: ${key} @ @{position}`, column);\n      result[position] = column;\n    }\n\n    assert(\n      `Generated orderedColumns' length (${result.filter(Boolean).length}) ` +\n        `does not match the length of all columns (${allColumns.length}). ` +\n        `orderedColumns: ${result\n          .filter(Boolean)\n          .map((c) => c.key)\n          .join(', ')} -- ` +\n        `all columns: ${allColumns.map((c) => c.key).join(', ')}`,\n      result.filter(Boolean).length === allColumns.length,\n    );\n\n    return result.filter(Boolean);\n  }\n}\n\n/**\n * @private\n *\n * Utility for helping determine the percieved order of a set of columns\n * given the original (default) ordering, and then user-configurations.\n *\n * This function adds missing columns but preserves extra columns in the map\n * (they might be hidden, not deleted).\n */\nexport function orderOf(\n  columns: { key: string }[],\n  currentOrder: Map<string, number>,\n): Map<string, number> {\n  // Create a copy to avoid mutating the input\n  let workingOrder = new Map(currentOrder);\n\n  // Add any missing columns to the end\n  addMissingColumnsToMap(columns, workingOrder);\n\n  // DON'T remove extra columns - they might be hidden columns, not deleted ones\n  // The ColumnOrder constructor handles removal of truly deleted columns\n\n  // Ensure positions are consecutive and zero based\n  let inOrder = Array.from(workingOrder.entries()).sort(\n    ([_keyA, positionA], [_keyB, positionB]) => positionA - positionB,\n  );\n\n  let orderedColumns = new Map<string, number>();\n\n  let position = 0;\n\n  for (let [key] of inOrder) {\n    orderedColumns.set(key, position++);\n  }\n\n  return orderedColumns;\n}\n\n/**\n * @private\n *\n * Utility to add any missing columns to the position map. By calling this whenever\n * data is passed in to the system we can simplify the code within the system because\n * we know we are dealing with a full set of positions.\n *\n * @param columns - A list of all columns available to the table\n * @param map - A Map of `key` to position (as a zero based integer)\n */\nfunction addMissingColumnsToMap(\n  columns: { key: string }[],\n  map: Map<string, number>,\n): void {\n  if (map.size < columns.length) {\n    let maxAssignedColumn = Math.max(...map.values());\n\n    for (let column of columns) {\n      if (map.get(column.key) === undefined) {\n        map.set(column.key, ++maxAssignedColumn);\n      }\n    }\n  }\n}\n\n/**\n * @private\n *\n * Utility to remove any extra columns from the position map. By calling this whenever\n * data is passed in to the system we can simplify the code within the system because\n * we know we are dealing with a full set of positions.\n *\n * @param columns - A list of all columns available to the table\n * @param map - A Map of `key` to position (as a zero based integer)\n */\nfunction removeExtraColumnsFromMap(\n  columns: { key: string }[],\n  map: Map<string, number>,\n): void {\n  let columnsLookup = columns.reduce(\n    function (acc, { key }) {\n      acc[key] = true;\n\n      return acc;\n    },\n    {} as Record<string, boolean>,\n  );\n\n  for (let key of map.keys()) {\n    if (!columnsLookup[key]) {\n      map.delete(key);\n    }\n  }\n}\n"],"names":["ColumnReordering","BasePlugin","constructor","args","_defineProperty","column","ColumnMeta","table","TableMeta","reset","tableMeta","meta","forTable","columns","_ColumnMeta_brand","WeakSet","_classPrivateMethodInitSpec","_classPrivateGetter","_get_tableMeta","columnOrder","moveLeft","key","moveRight","position","getPosition","value","setPosition","canMoveLeft","canMoveRight","length","cannotMoveLeft","cannotMoveRight","_this","_class","_initializerDefineProperty","_descriptor","order","setAll","map","get","newPosition","swapWith","preferences","delete","ColumnOrder","allColumns","visibleColumns","save","entries","set","read","Map","Object","orderedColumns","filter","for","reduce","acc","values","_applyDecoratedDescriptor","prototype","tracked","configurable","enumerable","writable","initializer","existingOrder","action","getOwnPropertyDescriptor","_class2","TrackedMap","addMissingColumnsToMap","removeExtraColumnsFromMap","clear","newOrder","i","getVisibleColumns","col","found","reverse","currentPosition","assert","undefined","displayedColumnPosition","validPositions","orderedMap","includes","entry","join","keys","size","keyByPosition","existingPosition","has","result","orderOf","columnsByKey","keyMap","mergedOrder","Array","from","Boolean","c","cached","currentOrder","workingOrder","inOrder","sort","_keyA","positionA","_keyB","positionB","maxAssignedColumn","Math","max","columnsLookup"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universal-ember/table",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "An implementation of table behaviors for driving any table or table-like UI -- all without a UI (headless)",
   "keywords": [
     "ember-addon",

package/src/plugins/column-reordering/plugin.ts

@@ -62,6 +62,7 @@ export class ColumnMeta {
     return this.#tableMeta.getPosition(this.column);
   }
 
+  // Swaps this column with the column in the new position
   set position(value: number) {
     this.#tableMeta.setPosition(this.column, value);
   }
@@ -113,7 +114,8 @@ export class TableMeta {
    */
   @tracked
   columnOrder = new ColumnOrder({
-    columns: () => this.availableColumns,
+    columns: () => this.allColumns,
+    visibleColumns: () => this.visibleColumns,
     save: this.save,
     existingOrder: this.read(),
   });
@@ -152,7 +154,8 @@ export class TableMeta {
   reset() {
     preferences.forTable(this.table, ColumnReordering).delete('order');
     this.columnOrder = new ColumnOrder({
-      columns: () => this.availableColumns,
+      columns: () => this.allColumns,
+      visibleColumns: () => this.visibleColumns,
       save: this.save,
     });
   }
@@ -186,15 +189,27 @@ export class TableMeta {
   }
 
   get columns() {
-    return this.columnOrder.orderedColumns;
+    return this.columnOrder.orderedColumns.filter(
+      (column) => this.visibleColumns[column.key],
+    );
   }
 
   /**
    * @private
    * This isn't our data to expose, but it is useful to alias
    */
-  private get availableColumns() {
-    return columns.for(this.table, ColumnReordering);
+  private get visibleColumns() {
+    return columns
+      .for(this.table, ColumnReordering)
+      .reduce<Record<string, boolean>>((acc, column) => {
+        acc[column.key] = true;
+
+        return acc;
+      }, {});
+  }
+
+  private get allColumns() {
+    return this.table.columns.values();
   }
 }
 
@@ -210,14 +225,73 @@ export class ColumnOrder {
 
   constructor(
     private args: {
+      /**
+       * All columns to track in the ordering.
+       *
+       * Backwards compatible usage (without ColumnVisibility):
+       * - Pass only the columns you want to display
+       * - All columns are treated as visible
+       *
+       * New usage (with ColumnVisibility):
+       * - Pass ALL columns (including hidden ones)
+       * - Provide `visibleColumns` to indicate which are visible
+       * - Hidden columns maintain their position when toggled
+       */
       columns: () => Column[];
+      /**
+       * Optional: Record of which columns are currently visible.
+       * When provided, moveLeft/moveRight will skip over hidden columns.
+       * When omitted, all columns from `columns` are treated as visible (backwards compatible).
+       *
+       * Example when using ColumnVisibility:
+       * ```ts
+       * visibleColumns: () => columns.reduce((acc, col) => {
+       *   acc[col.key] = meta(col).ColumnVisibility?.isVisible !== false;
+       *   return acc;
+       * }, {})
+       * ```
+       */
+      visibleColumns?: () => Record<string, boolean>;
+      /**
+       * Optional: Callback to persist the column order (e.g., to localStorage).
+       */
       save?: (order: Map<string, number>) => void;
+      /**
+       * Optional: Previously saved column order to restore.
+       */
       existingOrder?: Map<string, number>;
     },
   ) {
+    let allColumns = this.args.columns();
+
     if (args.existingOrder) {
-      this.map = new TrackedMap(args.existingOrder);
+      let newOrder = new Map(args.existingOrder.entries());
+
+      addMissingColumnsToMap(allColumns, newOrder);
+      removeExtraColumnsFromMap(allColumns, newOrder);
+      this.map = new TrackedMap(newOrder);
+    } else {
+      this.map = new TrackedMap(allColumns.map((column, i) => [column.key, i]));
+    }
+  }
+
+  /**
+   * @private
+   * Helper to get visible columns, defaulting to all columns if not specified
+   */
+  private getVisibleColumns(): Record<string, boolean> {
+    if (this.args.visibleColumns) {
+      return this.args.visibleColumns();
     }
+
+    // Default: all columns are visible
+    return this.args.columns().reduce(
+      (acc, col) => {
+        acc[col.key] = true;
+        return acc;
+      },
+      {} as Record<string, boolean>,
+    );
   }
 
   /**
@@ -230,15 +304,32 @@ export class ColumnOrder {
   @action
   moveLeft(key: string) {
     const orderedColumns = this.orderedColumns;
+    if (this.map.get(key) === 0) {
+      return;
+    }
 
     let found = false;
-    let nextColumn: { key: string } | undefined;
 
     for (const column of orderedColumns.reverse()) {
       if (found) {
-        nextColumn = column;
+        // Shift moved column left
+        let currentPosition = this.map.get(key);
 
-        break;
+        assert('current key must exist in map', currentPosition !== undefined);
+        this.map.set(key, currentPosition - 1);
+
+        // Shift displayed column right
+        let displayedColumnPosition = this.map.get(column.key);
+
+        assert(
+          'displaced key must exist in map',
+          displayedColumnPosition !== undefined,
+        );
+        this.map.set(column.key, displayedColumnPosition + 1);
+
+        if (this.getVisibleColumns()[column.key]) {
+          break;
+        }
       }
 
       if (column.key === key) {
@@ -246,14 +337,15 @@ export class ColumnOrder {
       }
     }
 
-    if (!nextColumn) return;
-
-    const nextPosition = this.get(nextColumn.key);
-
-    this.swapWith(key, nextPosition);
+    this.args.save?.(this.map);
   }
 
   setAll = (map: Map<string, number>) => {
+    let allColumns = this.args.columns();
+
+    addMissingColumnsToMap(allColumns, map);
+    removeExtraColumnsFromMap(allColumns, map);
+
     this.map.clear();
 
     for (const [key, value] of map.entries()) {
@@ -273,15 +365,28 @@ export class ColumnOrder {
   @action
   moveRight(key: string) {
     const orderedColumns = this.orderedColumns;
-
     let found = false;
-    let nextColumn: { key: string } | undefined;
 
     for (const column of orderedColumns) {
       if (found) {
-        nextColumn = column;
+        // Shift moved column right
+        let currentPosition = this.map.get(key);
 
-        break;
+        assert('current key must exist in map', currentPosition !== undefined);
+        this.map.set(key, currentPosition + 1);
+
+        // Shift displaced column left
+        let displayedColumnPosition = this.map.get(column.key);
+
+        assert(
+          'displaced key must exist in map',
+          displayedColumnPosition !== undefined,
+        );
+        this.map.set(column.key, displayedColumnPosition - 1);
+
+        if (this.getVisibleColumns()[column.key]) {
+          break;
+        }
       }
 
       if (column.key === key) {
@@ -289,11 +394,7 @@ export class ColumnOrder {
       }
     }
 
-    if (!nextColumn) return;
-
-    const nextPosition = this.get(nextColumn.key);
-
-    this.swapWith(key, nextPosition);
+    this.args.save?.(this.map);
   }
 
   /**
@@ -322,11 +423,8 @@ export class ColumnOrder {
         [...this.orderedMap.entries()]
           .map((entry) => entry.join(' => '))
           .join(', ') +
-        ` and the availableColumns are: ` +
-        this.args
-          .columns()
-          .map((column) => column.key)
-          .join(', ') +
+        ` and the visibleColumns are: ` +
+        Object.keys(this.getVisibleColumns()).join(', ') +
         ` and current "map" (${this.map.size}) is: ` +
         [...this.map.entries()].map((entry) => entry.join(' => ')).join(', '),
       undefined !== currentPosition,
@@ -399,21 +497,20 @@ export class ColumnOrder {
 
   @cached
   get orderedColumns(): Column[] {
-    const availableColumns = this.args.columns();
-    const availableByKey = availableColumns.reduce(
+    const allColumns = this.args.columns();
+    const columnsByKey = allColumns.reduce(
       (keyMap, column) => {
         keyMap[column.key] = column;
-
         return keyMap;
       },
       {} as Record<string, Column>,
     );
-    const mergedOrder = orderOf(availableColumns, this.map);
+    const mergedOrder = orderOf(allColumns, this.map);
 
-    const result: Column[] = Array.from({ length: availableColumns.length });
+    const result: Column[] = Array.from({ length: allColumns.length });
 
     for (const [key, position] of mergedOrder.entries()) {
-      const column = availableByKey[key];
+      const column = columnsByKey[key];
 
       assert(`Could not find column for pair: ${key} @ @{position}`, column);
       result[position] = column;
@@ -421,13 +518,13 @@ export class ColumnOrder {
 
     assert(
       `Generated orderedColumns' length (${result.filter(Boolean).length}) ` +
-        `does not match the length of available columns (${availableColumns.length}). ` +
+        `does not match the length of all columns (${allColumns.length}). ` +
         `orderedColumns: ${result
           .filter(Boolean)
           .map((c) => c.key)
           .join(', ')} -- ` +
-        `available columns: ${availableColumns.map((c) => c.key).join(', ')}`,
-      result.filter(Boolean).length === availableColumns.length,
+        `all columns: ${allColumns.map((c) => c.key).join(', ')}`,
+      result.filter(Boolean).length === allColumns.length,
     );
 
     return result.filter(Boolean);
@@ -438,55 +535,91 @@ export class ColumnOrder {
  * @private
  *
  * Utility for helping determine the percieved order of a set of columns
- * given the original (default) ordering, and then user-configurations
+ * given the original (default) ordering, and then user-configurations.
+ *
+ * This function adds missing columns but preserves extra columns in the map
+ * (they might be hidden, not deleted).
  */
 export function orderOf(
   columns: { key: string }[],
   currentOrder: Map<string, number>,
 ): Map<string, number> {
-  const result = new Map<string, number>();
-  const availableColumns = columns.map((column) => column.key);
-  const availableSet = new Set(availableColumns);
-  const current = new Map<number, string>(
-    [...currentOrder.entries()].map(([key, position]) => [position, key]),
+  // Create a copy to avoid mutating the input
+  let workingOrder = new Map(currentOrder);
+
+  // Add any missing columns to the end
+  addMissingColumnsToMap(columns, workingOrder);
+
+  // DON'T remove extra columns - they might be hidden columns, not deleted ones
+  // The ColumnOrder constructor handles removal of truly deleted columns
+
+  // Ensure positions are consecutive and zero based
+  let inOrder = Array.from(workingOrder.entries()).sort(
+    ([_keyA, positionA], [_keyB, positionB]) => positionA - positionB,
   );
 
-  /**
-   * O(n * log(n)) ?
-   */
-  for (let i = 0; i < Math.max(columns.length, current.size); i++) {
-    const orderedKey = current.get(i);
+  let orderedColumns = new Map<string, number>();
 
-    if (orderedKey) {
-      /**
-       * If the currentOrder specifies columns not presently available,
-       * ignore them
-       */
-      if (availableSet.has(orderedKey)) {
-        result.set(orderedKey, i);
-        continue;
-      }
-    }
+  let position = 0;
 
-    let availableKey: string | undefined;
+  for (let [key] of inOrder) {
+    orderedColumns.set(key, position++);
+  }
 
-    while ((availableKey = availableColumns.shift())) {
-      if (result.has(availableKey) || currentOrder.has(availableKey)) {
-        continue;
-      }
+  return orderedColumns;
+}
 
-      break;
+/**
+ * @private
+ *
+ * Utility to add any missing columns to the position map. By calling this whenever
+ * data is passed in to the system we can simplify the code within the system because
+ * we know we are dealing with a full set of positions.
+ *
+ * @param columns - A list of all columns available to the table
+ * @param map - A Map of `key` to position (as a zero based integer)
+ */
+function addMissingColumnsToMap(
+  columns: { key: string }[],
+  map: Map<string, number>,
+): void {
+  if (map.size < columns.length) {
+    let maxAssignedColumn = Math.max(...map.values());
+
+    for (let column of columns) {
+      if (map.get(column.key) === undefined) {
+        map.set(column.key, ++maxAssignedColumn);
+      }
     }
+  }
+}
 
-    if (!availableKey) {
-      /**
-       * The rest of our columns likely have their order set
-       */
-      continue;
-    }
+/**
+ * @private
+ *
+ * Utility to remove any extra columns from the position map. By calling this whenever
+ * data is passed in to the system we can simplify the code within the system because
+ * we know we are dealing with a full set of positions.
+ *
+ * @param columns - A list of all columns available to the table
+ * @param map - A Map of `key` to position (as a zero based integer)
+ */
+function removeExtraColumnsFromMap(
+  columns: { key: string }[],
+  map: Map<string, number>,
+): void {
+  let columnsLookup = columns.reduce(
+    function (acc, { key }) {
+      acc[key] = true;
 
-    result.set(availableKey, i);
-  }
+      return acc;
+    },
+    {} as Record<string, boolean>,
+  );
 
-  return result;
+  for (let key of map.keys()) {
+    if (!columnsLookup[key]) {
+      map.delete(key);
+    }
+  }
 }