@svgrid/grid 2.2.27 → 2.2.29

package/src/collaboration.test.ts

@@ -1,104 +1,104 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  broadcastChannelTransport,
-  createCollaboration,
-  type CollabMessage,
-  type CollabTransport,
-} from './collaboration'
-
-/** An in-memory bus so two controllers can talk in a test. */
-function makeBus() {
-  const handlers = new Set<(m: CollabMessage) => void>()
-  const transportFor = (): CollabTransport => ({
-    post: (msg) => {
-      // deliver async-ish to every subscriber except none (real channels echo
-      // to other tabs, not self; our controllers ignore their own id anyway).
-      for (const h of [...handlers]) h(msg)
-    },
-    subscribe: (h) => {
-      handlers.add(h)
-      return () => handlers.delete(h)
-    },
-  })
-  return { transportFor }
-}
-
-const userA = { id: 'a', name: 'Ada', color: '#f00' }
-const userB = { id: 'b', name: 'Bob', color: '#00f' }
-
-describe('createCollaboration', () => {
-  it('peers see each other after hello', () => {
-    const bus = makeBus()
-    const a = createCollaboration({ user: userA, transport: bus.transportFor() })
-    const b = createCollaboration({ user: userB, transport: bus.transportFor() })
-    // A is announced; B's hello reaches A; A replies presence.
-    expect(a.peers().map((p) => p.id)).toEqual(['b'])
-    expect(b.peers().map((p) => p.id)).toEqual(['a'])
-    a.dispose()
-    b.dispose()
-  })
-
-  it('closes the transport channel on dispose (#82)', () => {
-    // The controller now forwards dispose to the transport...
-    const disposeSpy = vi.fn()
-    const collab = createCollaboration({
-      user: userA,
-      transport: { post: vi.fn(), subscribe: () => () => {}, dispose: disposeSpy },
-    })
-    collab.dispose()
-    expect(disposeSpy).toHaveBeenCalledTimes(1)
-
-    // ...and broadcastChannelTransport.dispose() closes the BroadcastChannel.
-    const close = vi.fn()
-    class FakeBroadcastChannel {
-      postMessage = vi.fn()
-      addEventListener = vi.fn()
-      removeEventListener = vi.fn()
-      close = close
-      constructor(public name: string) {}
-    }
-    const Orig = (globalThis as { BroadcastChannel?: unknown }).BroadcastChannel
-    ;(globalThis as { BroadcastChannel?: unknown }).BroadcastChannel = FakeBroadcastChannel
-    try {
-      broadcastChannelTransport('room').dispose?.()
-      expect(close).toHaveBeenCalledTimes(1)
-    } finally {
-      ;(globalThis as { BroadcastChannel?: unknown }).BroadcastChannel = Orig
-    }
-  })
-
-  it('setCell propagates a remote cursor', () => {
-    const bus = makeBus()
-    const onPeers = vi.fn()
-    const a = createCollaboration({ user: userA, transport: bus.transportFor(), onPeersChange: onPeers })
-    const b = createCollaboration({ user: userB, transport: bus.transportFor() })
-    b.setCell({ rowId: 'r1', columnId: 'salary' })
-    const peerB = a.peers().find((p) => p.id === 'b')
-    expect(peerB?.cell).toEqual({ rowId: 'r1', columnId: 'salary' })
-    a.dispose()
-    b.dispose()
-  })
-
-  it('sendEdit fires onRemoteEdit on the other peer only', () => {
-    const bus = makeBus()
-    const aEdits = vi.fn()
-    const bEdits = vi.fn()
-    const a = createCollaboration({ user: userA, transport: bus.transportFor(), onRemoteEdit: aEdits })
-    const b = createCollaboration({ user: userB, transport: bus.transportFor(), onRemoteEdit: bEdits })
-    a.sendEdit('r2', 'name', 'Grace')
-    expect(bEdits).toHaveBeenCalledWith(expect.objectContaining({ rowId: 'r2', columnId: 'name', value: 'Grace' }))
-    expect(aEdits).not.toHaveBeenCalled() // not echoed to self
-    a.dispose()
-    b.dispose()
-  })
-
-  it('bye removes a peer', () => {
-    const bus = makeBus()
-    const a = createCollaboration({ user: userA, transport: bus.transportFor() })
-    const b = createCollaboration({ user: userB, transport: bus.transportFor() })
-    expect(a.peers()).toHaveLength(1)
-    b.dispose()
-    expect(a.peers()).toHaveLength(0)
-    a.dispose()
-  })
-})
+import { describe, expect, it, vi } from 'vitest'
+import {
+  broadcastChannelTransport,
+  createCollaboration,
+  type CollabMessage,
+  type CollabTransport,
+} from './collaboration'
+
+/** An in-memory bus so two controllers can talk in a test. */
+function makeBus() {
+  const handlers = new Set<(m: CollabMessage) => void>()
+  const transportFor = (): CollabTransport => ({
+    post: (msg) => {
+      // deliver async-ish to every subscriber except none (real channels echo
+      // to other tabs, not self; our controllers ignore their own id anyway).
+      for (const h of [...handlers]) h(msg)
+    },
+    subscribe: (h) => {
+      handlers.add(h)
+      return () => handlers.delete(h)
+    },
+  })
+  return { transportFor }
+}
+
+const userA = { id: 'a', name: 'Ada', color: '#f00' }
+const userB = { id: 'b', name: 'Bob', color: '#00f' }
+
+describe('createCollaboration', () => {
+  it('peers see each other after hello', () => {
+    const bus = makeBus()
+    const a = createCollaboration({ user: userA, transport: bus.transportFor() })
+    const b = createCollaboration({ user: userB, transport: bus.transportFor() })
+    // A is announced; B's hello reaches A; A replies presence.
+    expect(a.peers().map((p) => p.id)).toEqual(['b'])
+    expect(b.peers().map((p) => p.id)).toEqual(['a'])
+    a.dispose()
+    b.dispose()
+  })
+
+  it('closes the transport channel on dispose (#82)', () => {
+    // The controller now forwards dispose to the transport...
+    const disposeSpy = vi.fn()
+    const collab = createCollaboration({
+      user: userA,
+      transport: { post: vi.fn(), subscribe: () => () => {}, dispose: disposeSpy },
+    })
+    collab.dispose()
+    expect(disposeSpy).toHaveBeenCalledTimes(1)
+
+    // ...and broadcastChannelTransport.dispose() closes the BroadcastChannel.
+    const close = vi.fn()
+    class FakeBroadcastChannel {
+      postMessage = vi.fn()
+      addEventListener = vi.fn()
+      removeEventListener = vi.fn()
+      close = close
+      constructor(public name: string) {}
+    }
+    const Orig = (globalThis as { BroadcastChannel?: unknown }).BroadcastChannel
+    ;(globalThis as { BroadcastChannel?: unknown }).BroadcastChannel = FakeBroadcastChannel
+    try {
+      broadcastChannelTransport('room').dispose?.()
+      expect(close).toHaveBeenCalledTimes(1)
+    } finally {
+      ;(globalThis as { BroadcastChannel?: unknown }).BroadcastChannel = Orig
+    }
+  })
+
+  it('setCell propagates a remote cursor', () => {
+    const bus = makeBus()
+    const onPeers = vi.fn()
+    const a = createCollaboration({ user: userA, transport: bus.transportFor(), onPeersChange: onPeers })
+    const b = createCollaboration({ user: userB, transport: bus.transportFor() })
+    b.setCell({ rowId: 'r1', columnId: 'salary' })
+    const peerB = a.peers().find((p) => p.id === 'b')
+    expect(peerB?.cell).toEqual({ rowId: 'r1', columnId: 'salary' })
+    a.dispose()
+    b.dispose()
+  })
+
+  it('sendEdit fires onRemoteEdit on the other peer only', () => {
+    const bus = makeBus()
+    const aEdits = vi.fn()
+    const bEdits = vi.fn()
+    const a = createCollaboration({ user: userA, transport: bus.transportFor(), onRemoteEdit: aEdits })
+    const b = createCollaboration({ user: userB, transport: bus.transportFor(), onRemoteEdit: bEdits })
+    a.sendEdit('r2', 'name', 'Grace')
+    expect(bEdits).toHaveBeenCalledWith(expect.objectContaining({ rowId: 'r2', columnId: 'name', value: 'Grace' }))
+    expect(aEdits).not.toHaveBeenCalled() // not echoed to self
+    a.dispose()
+    b.dispose()
+  })
+
+  it('bye removes a peer', () => {
+    const bus = makeBus()
+    const a = createCollaboration({ user: userA, transport: bus.transportFor() })
+    const b = createCollaboration({ user: userB, transport: bus.transportFor() })
+    expect(a.peers()).toHaveLength(1)
+    b.dispose()
+    expect(a.peers()).toHaveLength(0)
+    a.dispose()
+  })
+})

package/src/collaboration.ts

@@ -1,167 +1,167 @@
-/**
- * Real-time collaboration. Presence (who else is here + where their cursor
- * is) and live edits (a change in one client lands in every other), over a
- * pluggable transport. The transport is the only thing tied to infrastructure
- * - swap `broadcastChannelTransport` (same-browser tabs, zero backend) for a
- * WebSocket / WebRTC / CRDT adapter and the controller is unchanged.
- *
- * This is also the natural "multiple agents on one grid" substrate: an AI
- * agent is just another peer posting `edit` messages.
- */
-export type CollabUser = {
-  id: string
-  name: string
-  /** A CSS color for this user's cursor / avatar. */
-  color: string
-}
-
-export type CollabCell = { rowId: string; columnId: string }
-
-export type CollabPresence = CollabUser & {
-  cell: CollabCell | null
-  /** Last time we heard from this peer (ms). Used to prune the gone. */
-  ts: number
-}
-
-export type CollabMessage =
-  | { kind: 'hello'; user: CollabUser }
-  | { kind: 'presence'; user: CollabUser; cell: CollabCell | null }
-  | { kind: 'edit'; user: CollabUser; rowId: string; columnId: string; value: unknown }
-  | { kind: 'bye'; userId: string }
-
-export type CollabTransport = {
-  post(msg: CollabMessage): void
-  subscribe(handler: (msg: CollabMessage) => void): () => void
-  /** Release any underlying resource (e.g. a BroadcastChannel). Optional. */
-  dispose?(): void
-}
-
-export type Collaboration = {
-  /** Broadcast where this user's cursor is (or null when it leaves). */
-  setCell(cell: CollabCell | null): void
-  /** Broadcast a cell edit to every peer. */
-  sendEdit(rowId: string, columnId: string, value: unknown): void
-  /** The peers currently present (excludes self). */
-  peers(): CollabPresence[]
-  dispose(): void
-}
-
-export type CollaborationOptions = {
-  user: CollabUser
-  transport: CollabTransport
-  /** Fired (with self excluded) whenever the peer set or a cursor changes. */
-  onPeersChange?: (peers: CollabPresence[]) => void
-  /** Fired when another user edits a cell - apply it to your data. */
-  onRemoteEdit?: (edit: {
-    rowId: string
-    columnId: string
-    value: unknown
-    user: CollabUser
-  }) => void
-  /** Drop peers we haven't heard from in this many ms. Default 15000. */
-  peerTimeoutMs?: number
-}
-
-/** BroadcastChannel transport - live across tabs of the same browser, no
- *  backend. No-ops where BroadcastChannel is unavailable (SSR / old env). */
-export function broadcastChannelTransport(name: string): CollabTransport {
-  const available = typeof BroadcastChannel !== 'undefined'
-  const channel = available ? new BroadcastChannel(name) : null
-  return {
-    post(msg) {
-      channel?.postMessage(msg)
-    },
-    subscribe(handler) {
-      if (!channel) return () => {}
-      const listener = (e: MessageEvent) => handler(e.data as CollabMessage)
-      channel.addEventListener('message', listener)
-      return () => channel.removeEventListener('message', listener)
-    },
-    dispose() {
-      channel?.close()
-    },
-  }
-}
-
-export function createCollaboration(options: CollaborationOptions): Collaboration {
-  const { user, transport } = options
-  const timeout = options.peerTimeoutMs ?? 15_000
-  const peers = new Map<string, CollabPresence>()
-  let ownCell: CollabCell | null = null
-  let disposed = false
-
-  const list = () => [...peers.values()].sort((a, b) => a.name.localeCompare(b.name))
-  const notify = () => options.onPeersChange?.(list())
-
-  function upsert(u: CollabUser, cell: CollabCell | null) {
-    if (u.id === user.id) return
-    peers.set(u.id, { ...u, cell, ts: Date.now() })
-    notify()
-  }
-
-  const unsubscribe = transport.subscribe((msg) => {
-    if (disposed) return
-    switch (msg.kind) {
-      case 'hello':
-        upsert(msg.user, null)
-        // Let the newcomer know we're here (and where our cursor is).
-        transport.post({ kind: 'presence', user, cell: ownCell })
-        break
-      case 'presence':
-        upsert(msg.user, msg.cell)
-        break
-      case 'edit':
-        upsert(msg.user, { rowId: msg.rowId, columnId: msg.columnId })
-        if (msg.user.id !== user.id) {
-          options.onRemoteEdit?.({
-            rowId: msg.rowId,
-            columnId: msg.columnId,
-            value: msg.value,
-            user: msg.user,
-          })
-        }
-        break
-      case 'bye':
-        if (peers.delete(msg.userId)) notify()
-        break
-    }
-  })
-
-  // Prune peers that went silent (closed tab without a `bye`).
-  const pruneTimer =
-    typeof setInterval !== 'undefined'
-      ? setInterval(() => {
-          const now = Date.now()
-          let changed = false
-          for (const [id, p] of peers) {
-            if (now - p.ts > timeout) {
-              peers.delete(id)
-              changed = true
-            }
-          }
-          if (changed) notify()
-        }, Math.max(1000, timeout / 3))
-      : null
-
-  // Announce ourselves.
-  transport.post({ kind: 'hello', user })
-
-  return {
-    setCell(cell) {
-      ownCell = cell
-      transport.post({ kind: 'presence', user, cell })
-    },
-    sendEdit(rowId, columnId, value) {
-      transport.post({ kind: 'edit', user, rowId, columnId, value })
-    },
-    peers: list,
-    dispose() {
-      if (disposed) return
-      disposed = true
-      transport.post({ kind: 'bye', userId: user.id })
-      unsubscribe()
-      if (pruneTimer) clearInterval(pruneTimer)
-      transport.dispose?.() // release the channel (BroadcastChannel etc.)
-    },
-  }
-}
+/**
+ * Real-time collaboration. Presence (who else is here + where their cursor
+ * is) and live edits (a change in one client lands in every other), over a
+ * pluggable transport. The transport is the only thing tied to infrastructure
+ * - swap `broadcastChannelTransport` (same-browser tabs, zero backend) for a
+ * WebSocket / WebRTC / CRDT adapter and the controller is unchanged.
+ *
+ * This is also the natural "multiple agents on one grid" substrate: an AI
+ * agent is just another peer posting `edit` messages.
+ */
+export type CollabUser = {
+  id: string
+  name: string
+  /** A CSS color for this user's cursor / avatar. */
+  color: string
+}
+
+export type CollabCell = { rowId: string; columnId: string }
+
+export type CollabPresence = CollabUser & {
+  cell: CollabCell | null
+  /** Last time we heard from this peer (ms). Used to prune the gone. */
+  ts: number
+}
+
+export type CollabMessage =
+  | { kind: 'hello'; user: CollabUser }
+  | { kind: 'presence'; user: CollabUser; cell: CollabCell | null }
+  | { kind: 'edit'; user: CollabUser; rowId: string; columnId: string; value: unknown }
+  | { kind: 'bye'; userId: string }
+
+export type CollabTransport = {
+  post(msg: CollabMessage): void
+  subscribe(handler: (msg: CollabMessage) => void): () => void
+  /** Release any underlying resource (e.g. a BroadcastChannel). Optional. */
+  dispose?(): void
+}
+
+export type Collaboration = {
+  /** Broadcast where this user's cursor is (or null when it leaves). */
+  setCell(cell: CollabCell | null): void
+  /** Broadcast a cell edit to every peer. */
+  sendEdit(rowId: string, columnId: string, value: unknown): void
+  /** The peers currently present (excludes self). */
+  peers(): CollabPresence[]
+  dispose(): void
+}
+
+export type CollaborationOptions = {
+  user: CollabUser
+  transport: CollabTransport
+  /** Fired (with self excluded) whenever the peer set or a cursor changes. */
+  onPeersChange?: (peers: CollabPresence[]) => void
+  /** Fired when another user edits a cell - apply it to your data. */
+  onRemoteEdit?: (edit: {
+    rowId: string
+    columnId: string
+    value: unknown
+    user: CollabUser
+  }) => void
+  /** Drop peers we haven't heard from in this many ms. Default 15000. */
+  peerTimeoutMs?: number
+}
+
+/** BroadcastChannel transport - live across tabs of the same browser, no
+ *  backend. No-ops where BroadcastChannel is unavailable (SSR / old env). */
+export function broadcastChannelTransport(name: string): CollabTransport {
+  const available = typeof BroadcastChannel !== 'undefined'
+  const channel = available ? new BroadcastChannel(name) : null
+  return {
+    post(msg) {
+      channel?.postMessage(msg)
+    },
+    subscribe(handler) {
+      if (!channel) return () => {}
+      const listener = (e: MessageEvent) => handler(e.data as CollabMessage)
+      channel.addEventListener('message', listener)
+      return () => channel.removeEventListener('message', listener)
+    },
+    dispose() {
+      channel?.close()
+    },
+  }
+}
+
+export function createCollaboration(options: CollaborationOptions): Collaboration {
+  const { user, transport } = options
+  const timeout = options.peerTimeoutMs ?? 15_000
+  const peers = new Map<string, CollabPresence>()
+  let ownCell: CollabCell | null = null
+  let disposed = false
+
+  const list = () => [...peers.values()].sort((a, b) => a.name.localeCompare(b.name))
+  const notify = () => options.onPeersChange?.(list())
+
+  function upsert(u: CollabUser, cell: CollabCell | null) {
+    if (u.id === user.id) return
+    peers.set(u.id, { ...u, cell, ts: Date.now() })
+    notify()
+  }
+
+  const unsubscribe = transport.subscribe((msg) => {
+    if (disposed) return
+    switch (msg.kind) {
+      case 'hello':
+        upsert(msg.user, null)
+        // Let the newcomer know we're here (and where our cursor is).
+        transport.post({ kind: 'presence', user, cell: ownCell })
+        break
+      case 'presence':
+        upsert(msg.user, msg.cell)
+        break
+      case 'edit':
+        upsert(msg.user, { rowId: msg.rowId, columnId: msg.columnId })
+        if (msg.user.id !== user.id) {
+          options.onRemoteEdit?.({
+            rowId: msg.rowId,
+            columnId: msg.columnId,
+            value: msg.value,
+            user: msg.user,
+          })
+        }
+        break
+      case 'bye':
+        if (peers.delete(msg.userId)) notify()
+        break
+    }
+  })
+
+  // Prune peers that went silent (closed tab without a `bye`).
+  const pruneTimer =
+    typeof setInterval !== 'undefined'
+      ? setInterval(() => {
+          const now = Date.now()
+          let changed = false
+          for (const [id, p] of peers) {
+            if (now - p.ts > timeout) {
+              peers.delete(id)
+              changed = true
+            }
+          }
+          if (changed) notify()
+        }, Math.max(1000, timeout / 3))
+      : null
+
+  // Announce ourselves.
+  transport.post({ kind: 'hello', user })
+
+  return {
+    setCell(cell) {
+      ownCell = cell
+      transport.post({ kind: 'presence', user, cell })
+    },
+    sendEdit(rowId, columnId, value) {
+      transport.post({ kind: 'edit', user, rowId, columnId, value })
+    },
+    peers: list,
+    dispose() {
+      if (disposed) return
+      disposed = true
+      transport.post({ kind: 'bye', userId: user.id })
+      unsubscribe()
+      if (pruneTimer) clearInterval(pruneTimer)
+      transport.dispose?.() // release the channel (BroadcastChannel etc.)
+    },
+  }
+}

package/src/column-groups.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { computeColumnGroupMeta, hiddenLeavesForCollapse } from './column-groups'
+import { resolveColumnId } from './column-id'
 
 // A group "Q1" with an always-on Total plus Jan/Feb that only show when open.
 const columns = [
@@ -57,3 +58,50 @@ describe('hiddenLeavesForCollapse', () => {
     expect(hidden.apr).toBeUndefined() // 'open' shows when expanded
   })
 })
+
+// ---------------------------------------------------------------------------
+// Id agreement with the engine
+// ---------------------------------------------------------------------------
+
+describe('unnamed columns', () => {
+  // Columns with neither `id` nor `field` get an id synthesized from their
+  // position. The engine, this module, and the group-header derivation all
+  // have to synthesize the SAME one - they used to disagree (`q1_d_1` here vs
+  // `q1_1_1` in the engine), so `columnGroupShow` on an unnamed column looked
+  // wired up but never actually hid anything.
+  const unnamed = [
+    { field: 'name' },
+    {
+      id: 'q1',
+      header: 'Q1',
+      columns: [
+        { field: 'jan', columnGroupShow: 'open' },
+        { header: 'Closed', columnGroupShow: 'closed' },
+        { header: 'Always' },
+      ],
+    },
+  ]
+
+  it('keys leafControl by the id the engine assigns', () => {
+    const meta = computeColumnGroupMeta(unnamed)
+    // `<parentId>_<depth>_<index>`: depth 1 under "q1", index 1 in its siblings.
+    expect(meta.leafControl.has('q1_1_1')).toBe(true)
+    expect(meta.leafControl.get('q1_1_1')).toEqual({ groupId: 'q1', show: 'closed' })
+    // The untagged sibling is not controlled, and no stale `_d_` key survives.
+    expect(meta.leafControl.has('q1_1_2')).toBe(false)
+    expect([...meta.leafControl.keys()].some((k) => k.includes('_d_'))).toBe(false)
+  })
+
+  it('hides an unnamed closed-mode leaf once the group is expanded', () => {
+    const meta = computeColumnGroupMeta(unnamed)
+    expect(hiddenLeavesForCollapse(meta, new Set<string>())).toEqual({ q1_1_1: true })
+    expect(hiddenLeavesForCollapse(meta, new Set(['q1']))).toEqual({ jan: true })
+  })
+
+  it('matches resolveColumnId at every depth', () => {
+    expect(resolveColumnId({ field: 'jan' }, 'q1', 1, 0)).toBe('jan')
+    expect(resolveColumnId({ id: 'q1' }, undefined, 0, 1)).toBe('q1')
+    expect(resolveColumnId({ header: 'X' }, 'q1', 1, 2)).toBe('q1_1_2')
+    expect(resolveColumnId({ header: 'X' }, undefined, 0, 3)).toBe('col_0_3')
+  })
+})

package/src/column-groups.ts

@@ -20,12 +20,7 @@ export type ColumnGroupMeta = {
   leafControl: Map<string, { groupId: string; show: ColumnGroupShow }>;
 };
 
-// Mirror the id resolution used by the group-header derivation so group ids and
-// leaf ids line up across both.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function idOf(def: any, parentId: string | undefined, ix: number): string {
-  return def.id ?? def.field ?? `${parentId ?? "col"}_d_${ix}`;
-}
+import { resolveColumnId } from "./column-id";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function computeColumnGroupMeta(columns: ReadonlyArray<any>): ColumnGroupMeta {
@@ -33,10 +28,13 @@ export function computeColumnGroupMeta(columns: ReadonlyArray<any>): ColumnGroup
   const defaultOpen = new Map<string, boolean>();
   const leafControl = new Map<string, { groupId: string; show: ColumnGroupShow }>();
 
+  // `depth` is threaded because it is part of the id of an unnamed column -
+  // drop it and the ids here stop matching the ones the engine assigns, so
+  // `leafControl` lookups silently miss for those columns.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function walk(defs: ReadonlyArray<any>, parentId: string | undefined, controllingGroup: string | undefined) {
+  function walk(defs: ReadonlyArray<any>, parentId: string | undefined, controllingGroup: string | undefined, depth: number) {
     defs.forEach((def, ix) => {
-      const id = idOf(def, parentId, ix);
+      const id = resolveColumnId(def, parentId, depth, ix);
       if (def.columns?.length) {
         // A group is collapsible when any DIRECT child declares columnGroupShow.
         const collapsible = def.columns.some(
@@ -47,7 +45,7 @@ export function computeColumnGroupMeta(columns: ReadonlyArray<any>): ColumnGroup
           collapsibleGroupIds.add(id);
           defaultOpen.set(id, def.openByDefault === true);
         }
-        walk(def.columns, id, collapsible ? id : controllingGroup);
+        walk(def.columns, id, collapsible ? id : controllingGroup, depth + 1);
       } else {
         const show = def.columnGroupShow;
         if ((show === "open" || show === "closed") && controllingGroup) {
@@ -57,7 +55,7 @@ export function computeColumnGroupMeta(columns: ReadonlyArray<any>): ColumnGroup
     });
   }
 
-  walk(columns, undefined, undefined);
+  walk(columns, undefined, undefined, 0);
   return { collapsibleGroupIds, defaultOpen, leafControl };
 }