Merge pull request #1165 from mathuo/rename/tab-group-color

refactor: rename TabGroupColor to DockviewTabGroupColor and convert T…

Author: mathuo

.github/workflows/main.yml

@@ -83,13 +83,23 @@ jobs:
                   fi
                   echo "Generated files are up to date."
 
+            - name: Remove stale gen comment
+              if: always() && github.event_name == 'pull_request'
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  gh api "repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments" \
+                    --paginate --jq '.[] | select(.body | contains("<!-- gen-check -->")) | .id' \
+                  | xargs -I{} gh api -X DELETE "repos/${{ github.repository }}/issues/comments/{}"
+
             - name: Comment diff on PR
               if: failure() && github.event_name == 'pull_request'
               env:
                   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
                   DIFF=$(cat /tmp/gen-diff.txt)
                   gh pr comment ${{ github.event.pull_request.number }} --body "$(cat <<EOF
+                  <!-- gen-check -->
                   ## ⚠️ Generated files are out of date
 
                   Run \`npm run gen\` and commit the result.

__generated__/dockview-core-exports.txt

@@ -1,6 +1,9 @@
 import { fireEvent } from '@testing-library/dom';
 import { TabGroupChip } from '../../../../dockview/components/titlebar/tabGroupChip';
-import { TabGroup, TAB_GROUP_COLORS } from '../../../../dockview/tabGroup';
+import {
+    TabGroup,
+    DockviewTabGroupColors,
+} from '../../../../dockview/tabGroup';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { DockviewApi } from '../../../../api/component.api';
 
@@ -208,10 +211,10 @@ describe('TabGroupChip', () => {
             api: fromPartial<DockviewApi>({}),
         });
 
-        for (const color of TAB_GROUP_COLORS) {
+        for (const color of Object.values(DockviewTabGroupColors)) {
             tabGroup.setColor(color);
 
-            for (const c of TAB_GROUP_COLORS) {
+            for (const c of Object.values(DockviewTabGroupColors)) {
                 expect(
                     chip.element.classList.contains(`dv-tab-group-chip--${c}`)
                 ).toBe(c === color);

packages/dockview-core/src/__tests__/dockview/components/titlebar/tabGroupChip.spec.ts

@@ -1,6 +1,6 @@
 import {
     TabGroup,
-    TabGroupColor,
+    DockviewTabGroupColor,
     isValidTabGroupColor,
 } from '../../dockview/tabGroup';
 
@@ -26,7 +26,7 @@ describe('TabGroup', () => {
 
     test('should default invalid color to grey', () => {
         const group = new TabGroup('g3', {
-            color: 'invalid' as TabGroupColor,
+            color: 'invalid' as DockviewTabGroupColor,
         });
         expect(group.color).toBe('grey');
         group.dispose();
@@ -160,7 +160,7 @@ describe('TabGroup', () => {
 
     test('should default to grey on invalid color set', () => {
         const group = new TabGroup('g1', { color: 'blue' });
-        group.setColor('invalid' as TabGroupColor);
+        group.setColor('invalid' as DockviewTabGroupColor);
         expect(group.color).toBe('grey');
         group.dispose();
     });

packages/dockview-core/src/__tests__/dockview/tabGroup.test.ts

@@ -58,7 +58,7 @@ import {
     DockviewTabGroupCollapsedChangeEvent,
     DockviewTabGroupPanelChangeEvent,
 } from '../dockview/events';
-import { ITabGroup, TabGroupColor } from '../dockview/tabGroup';
+import { ITabGroup, DockviewTabGroupColor } from '../dockview/tabGroup';
 import {
     PaneviewComponentOptions,
     PaneviewDndOverlayEvent,
@@ -1041,7 +1041,7 @@ export class DockviewApi implements CommonApi<SerializedDockview> {
     createTabGroup(options: {
         groupId: string;
         label?: string;
-        color?: TabGroupColor;
+        color?: DockviewTabGroupColor;
     }): ITabGroup {
         const model = this._getGroupModel(options.groupId);
         return model.createTabGroup({

packages/dockview-core/src/api/component.api.ts

@@ -1,7 +1,11 @@
 import { addDisposableListener, Emitter, Event } from '../../../events';
 import { CompositeDisposable } from '../../../lifecycle';
 import { toggleClass } from '../../../dom';
-import { ITabGroup, TabGroupColor, TAB_GROUP_COLORS } from '../../tabGroup';
+import {
+    ITabGroup,
+    DockviewTabGroupColor,
+    DockviewTabGroupColors,
+} from '../../tabGroup';
 import { ITabGroupChipRenderer } from '../../framework';
 import { DockviewApi } from '../../../api/component.api';
 
@@ -83,8 +87,8 @@ export class TabGroupChip
         this.updateCollapsed(params.tabGroup.collapsed);
     }
 
-    private updateColor(color: TabGroupColor): void {
-        for (const c of TAB_GROUP_COLORS) {
+    private updateColor(color: DockviewTabGroupColor): void {
+        for (const c of Object.values(DockviewTabGroupColors)) {
             toggleClass(this._element, `dv-tab-group-chip--${c}`, c === color);
         }
     }

packages/dockview-core/src/dockview/components/titlebar/tabGroupChip.ts

@@ -6,7 +6,7 @@ import {
     ContextMenuItemConfig,
     ContextMenuItem,
 } from './options';
-import { TAB_GROUP_COLORS, ITabGroup } from './tabGroup';
+import { DockviewTabGroupColors, ITabGroup } from './tabGroup';
 
 let _nextId = 0;
 const nextContextMenuItemId = () => `dv-ctx-menu-item-${_nextId++}`;
@@ -51,7 +51,7 @@ function buildColorPicker(tabGroup: ITabGroup, close: () => void): HTMLElement {
     const wrapper = document.createElement('div');
     wrapper.className = 'dv-context-menu-color-picker';
 
-    for (const color of TAB_GROUP_COLORS) {
+    for (const color of Object.values(DockviewTabGroupColors)) {
         const swatch = document.createElement('div');
         swatch.className = `dv-context-menu-color-swatch dv-tab-group-chip--${color}`;
         if (tabGroup.color === color) {

packages/dockview-core/src/dockview/contextMenu.ts

@@ -203,7 +203,7 @@ export interface FloatingGroupOptions {
     position?: AnchorPosition;
 }
 
-export interface FloatingGroupOptionsInternal extends FloatingGroupOptions {
+interface FloatingGroupOptionsInternal extends FloatingGroupOptions {
     skipRemoveGroup?: boolean;
     inDragMode?: boolean;
     skipActiveGroup?: boolean;

packages/dockview-core/src/dockview/dockviewComponent.ts

@@ -54,7 +54,7 @@ import { DropTargetAnchorContainer } from '../dnd/dropTargetAnchorContainer';
 import {
     TabGroup,
     ITabGroup,
-    TabGroupColor,
+    DockviewTabGroupColor,
     SerializedTabGroup,
 } from './tabGroup';
 import { EdgeGroupPosition } from './dockviewShell';
@@ -660,7 +660,7 @@ export class DockviewGroupPanelModel
 
     createTabGroup(options?: {
         label?: string;
-        color?: TabGroupColor;
+        color?: DockviewTabGroupColor;
         id?: string;
     }): ITabGroup {
         const id = options?.id ?? `tg-${this.id}-${this._tabGroupIdCounter++}`;

packages/dockview-core/src/dockview/dockviewGroupPanelModel.ts

@@ -179,7 +179,7 @@ export interface DockviewOptions {
 }
 
 export type TabAnimation = 'smooth' | 'default';
-export const DEFAULT_TAB_ANIMATION: TabAnimation = 'default';
+const DEFAULT_TAB_ANIMATION: TabAnimation = 'default';
 
 export interface DockviewDndOverlayEvent extends IAcceptableEvent {
     nativeEvent: DragEvent;