@a3s-lab/office 0.19.0 → 0.20.0

package/dist/6164.js

@@ -2092,64 +2092,6 @@ function isoDateFromTimestamp(timestamp) {
     if (!Number.isFinite(timestamp) || year < 1900 || year > 9999) return null;
     return `${String(year).padStart(4, '0')}-${String(date.getUTCMonth() + 1).padStart(2, '0')}-${String(date.getUTCDate()).padStart(2, '0')}`;
 }
-const spreadsheetUnderlineStyles = [
-    'none',
-    'single',
-    'double',
-    'singleAccounting',
-    'doubleAccounting'
-];
-const underlineCellValues = {
-    none: 0,
-    single: 1,
-    double: 2,
-    singleAccounting: 3,
-    doubleAccounting: 4
-};
-function isSpreadsheetUnderlineStyle(value) {
-    return 'string' == typeof value && spreadsheetUnderlineStyles.includes(value);
-}
-function spreadsheetUnderlineCellValue(style) {
-    return underlineCellValues[style];
-}
-function spreadsheetUnderlineStyle(value) {
-    switch(Number(value)){
-        case 1:
-            return 'single';
-        case 2:
-            return 'double';
-        case 3:
-        case 0x21:
-            return 'singleAccounting';
-        case 4:
-        case 0x22:
-            return 'doubleAccounting';
-        default:
-            return 'none';
-    }
-}
-function spreadsheetUnderlineCellValueFromXlsx(value) {
-    switch(value?.trim()){
-        case null:
-        case void 0:
-        case '':
-        case 'single':
-            return 1;
-        case 'double':
-            return 2;
-        case 'singleAccounting':
-            return 3;
-        case 'doubleAccounting':
-            return 4;
-        default:
-            return 0;
-    }
-}
-function spreadsheetUnderlineCellValueFromSheetJs(value) {
-    if (true === value) return 1;
-    if (isSpreadsheetUnderlineStyle(value)) return spreadsheetUnderlineCellValue(value);
-    return spreadsheetUnderlineCellValue(spreadsheetUnderlineStyle(value));
-}
 const spreadsheetTextOrientationIds = [
     'horizontal',
     'angleCounterclockwise',
@@ -2256,6 +2198,64 @@ function integer(value) {
     const parsed = 'number' == typeof value ? value : Number(value);
     return Number.isSafeInteger(parsed) ? parsed : null;
 }
+const spreadsheetUnderlineStyles = [
+    'none',
+    'single',
+    'double',
+    'singleAccounting',
+    'doubleAccounting'
+];
+const underlineCellValues = {
+    none: 0,
+    single: 1,
+    double: 2,
+    singleAccounting: 3,
+    doubleAccounting: 4
+};
+function isSpreadsheetUnderlineStyle(value) {
+    return 'string' == typeof value && spreadsheetUnderlineStyles.includes(value);
+}
+function spreadsheetUnderlineCellValue(style) {
+    return underlineCellValues[style];
+}
+function spreadsheetUnderlineStyle(value) {
+    switch(Number(value)){
+        case 1:
+            return 'single';
+        case 2:
+            return 'double';
+        case 3:
+        case 0x21:
+            return 'singleAccounting';
+        case 4:
+        case 0x22:
+            return 'doubleAccounting';
+        default:
+            return 'none';
+    }
+}
+function spreadsheetUnderlineCellValueFromXlsx(value) {
+    switch(value?.trim()){
+        case null:
+        case void 0:
+        case '':
+        case 'single':
+            return 1;
+        case 'double':
+            return 2;
+        case 'singleAccounting':
+            return 3;
+        case 'doubleAccounting':
+            return 4;
+        default:
+            return 0;
+    }
+}
+function spreadsheetUnderlineCellValueFromSheetJs(value) {
+    if (true === value) return 1;
+    if (isSpreadsheetUnderlineStyle(value)) return spreadsheetUnderlineCellValue(value);
+    return spreadsheetUnderlineCellValue(spreadsheetUnderlineStyle(value));
+}
 const SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS = [
     'greaterThan',
     'greaterThanOrEqual',

package/dist/internal/features/work/editors/office-color-picker.d.ts

@@ -1,11 +1,16 @@
 import { type ReactNode } from 'react';
-export declare function OfficeColorPicker({ ariaLabel, value, onValueChange, disabled, compact, className, triggerLabel, triggerIcon, }: {
+export declare function OfficeColorPicker({ ariaLabel, value, onValueChange, disabled, compact, className, resetAction, triggerLabel, triggerIcon, }: {
     ariaLabel: string;
     value: string;
     onValueChange: (value: string) => void;
     disabled?: boolean;
     compact?: boolean;
     className?: string;
+    resetAction?: {
+        kind: 'automatic' | 'none';
+        label: string;
+        onSelect: () => void;
+    };
     triggerLabel?: string;
     triggerIcon?: ReactNode;
 }): import("react").JSX.Element;

package/dist/internal/features/work/editors/spreadsheet-command-catalog.d.ts

@@ -146,9 +146,9 @@ export declare const spreadsheetCommandCatalog: {
             readonly group: "font";
         };
         readonly shortcut: {
-            readonly label: "Cmd/Ctrl+B";
-            readonly aria: "Control+B Meta+B";
-            readonly editor: readonly ["Mod-b"];
+            readonly label: "Cmd/Ctrl+B 或 Ctrl+2";
+            readonly aria: "Control+B Meta+B Control+2";
+            readonly editor: readonly ["Mod-b", "Control-2"];
         };
     };
     readonly italic: {
@@ -160,9 +160,9 @@ export declare const spreadsheetCommandCatalog: {
             readonly group: "font";
         };
         readonly shortcut: {
-            readonly label: "Cmd/Ctrl+I";
-            readonly aria: "Control+I Meta+I";
-            readonly editor: readonly ["Mod-i"];
+            readonly label: "Cmd/Ctrl+I 或 Ctrl+3";
+            readonly aria: "Control+I Meta+I Control+3";
+            readonly editor: readonly ["Mod-i", "Control-3"];
         };
     };
     readonly underline: {
@@ -174,9 +174,9 @@ export declare const spreadsheetCommandCatalog: {
             readonly group: "font";
         };
         readonly shortcut: {
-            readonly label: "Cmd/Ctrl+U";
-            readonly aria: "Control+U Meta+U";
-            readonly editor: readonly ["Mod-u"];
+            readonly label: "Cmd/Ctrl+U 或 Ctrl+4";
+            readonly aria: "Control+U Meta+U Control+4";
+            readonly editor: readonly ["Mod-u", "Control-4"];
         };
     };
     readonly strike: {

package/dist/internal/features/work/work-xlsx-cell-style-origin.d.ts

@@ -0,0 +1,44 @@
+import type { Cell } from '@fortune-sheet/core';
+import { type XlsxColorResolver } from './work-xlsx-colors';
+export type XlsxSemanticColorOrigin = {
+    kind: 'automatic';
+    baseColor: string;
+    renderedColor: string;
+    tint?: number;
+} | {
+    kind: 'indexed';
+    baseColor: string;
+    index: number;
+    renderedColor: string;
+    tint?: number;
+} | {
+    kind: 'theme';
+    baseColor: string;
+    index: number;
+    renderedColor: string;
+    tint?: number;
+};
+export type XlsxBorderColorOrigins = Partial<Record<'bottom' | 'diagonal' | 'left' | 'right' | 'top', XlsxSemanticColorOrigin>>;
+export interface XlsxCellStyleOrigin {
+    borderColors?: XlsxBorderColorOrigins;
+    fillColor?: XlsxSemanticColorOrigin;
+    fontColor?: XlsxSemanticColorOrigin;
+}
+export interface XlsxSemanticPalette {
+    indexed: ReadonlyMap<number, string>;
+    theme: ReadonlyMap<number, string>;
+}
+export interface PreparedXlsxSemanticPalette {
+    palette: XlsxSemanticPalette;
+    stylesChanged: boolean;
+    themeChanged: boolean;
+}
+export declare function readXlsxSemanticColorOrigin(element: Element | undefined, colors: XlsxColorResolver): XlsxSemanticColorOrigin | undefined;
+export declare function withXlsxCellStyleOrigin(cell: Cell, origin: XlsxCellStyleOrigin | undefined): Cell;
+export declare function xlsxCellStyleOrigin(cell: Cell | null | undefined): XlsxCellStyleOrigin | undefined;
+export declare function xlsxSemanticColorMatchesValue(origin: XlsxSemanticColorOrigin, value: unknown): boolean;
+export declare function xlsxColorElementMatchesOrigin(element: Element | undefined, origin: XlsxSemanticColorOrigin): boolean;
+export declare function applyXlsxSemanticColorOrigin(element: Element, origin: XlsxSemanticColorOrigin): void;
+export declare function xlsxSemanticColorOriginKey(origin: XlsxSemanticColorOrigin | undefined): string;
+export declare function xlsxSemanticColorOriginSupported(origin: XlsxSemanticColorOrigin, palette: XlsxSemanticPalette | undefined): boolean;
+export declare function prepareXlsxSemanticPalette(styles: Document, theme: Document | null, origins: Iterable<XlsxCellStyleOrigin>): PreparedXlsxSemanticPalette;

package/dist/internal/features/work/work-xlsx-cell-style-values.d.ts

@@ -0,0 +1,26 @@
+import type { Cell } from '@fortune-sheet/core';
+import { type SpreadsheetUnderlineStyle } from './work-spreadsheet-underline';
+import type { XlsxCellBorder } from './work-xlsx-cell-borders';
+import { type XlsxSemanticColorOrigin, type XlsxSemanticPalette } from './work-xlsx-cell-style-origin';
+import { type XlsxDirectAlignmentStyle } from './work-xlsx-cell-style-xml';
+import { type XlsxColorResolver } from './work-xlsx-colors';
+export interface XlsxDirectFontStyle {
+    bold?: boolean;
+    color?: string;
+    italic?: boolean;
+    name?: string;
+    size?: number;
+    strike?: boolean;
+    underline?: SpreadsheetUnderlineStyle;
+}
+export declare function hasXlsxDirectFontStyle(cell: Cell): boolean;
+export declare function directXlsxFontStyle(cell: Cell): XlsxDirectFontStyle;
+export declare function directXlsxAlignment(cell: Cell): XlsxDirectAlignmentStyle | null;
+export declare function xlsxStyleCollectionIndex(collection: Element, childName: string, value: string | null): number;
+export declare function xlsxColorMatches(element: Element | undefined, value: string, colors: XlsxColorResolver, fallback?: string): boolean;
+export declare function xlsxToggleEnabled(element: Element | undefined): boolean;
+export declare function xlsxUnderlineStyle(element: Element | undefined): SpreadsheetUnderlineStyle;
+export declare function xlsxBorderLineMatches(element: Element | undefined, line: NonNullable<XlsxCellBorder['top']> | null, colors: XlsxColorResolver, semanticColor?: XlsxSemanticColorOrigin): boolean;
+export declare function activeXlsxSemanticColorOrigin(origin: XlsxSemanticColorOrigin | undefined, value: unknown, palette: XlsxSemanticPalette | undefined): XlsxSemanticColorOrigin | undefined;
+export declare function xlsxBooleanAttribute(element: Element | undefined, name: string): boolean;
+export declare function xlsxAlignmentMatches(xf: Element, style: XlsxDirectAlignmentStyle): boolean;

package/dist/internal/features/work/work-xlsx-cell-style-writer.d.ts

@@ -1,7 +1,9 @@
 import type { Cell } from '@fortune-sheet/core';
 import type { XlsxCellBorder } from './work-xlsx-cell-borders';
+import { type XlsxSemanticPalette } from './work-xlsx-cell-style-origin';
 export declare class XlsxDirectCellStyleWriter {
     private readonly styles;
+    private readonly semanticPalette?;
     private readonly fonts;
     private readonly fills;
     private readonly borders;
@@ -10,8 +12,9 @@ export declare class XlsxDirectCellStyleWriter {
     private readonly generatedFills;
     private readonly generatedBorders;
     private readonly generatedStyles;
+    private readonly colors;
     changed: boolean;
-    constructor(styles: Document);
+    constructor(styles: Document, theme?: Document | null, semanticPalette?: XlsxSemanticPalette | undefined);
     styleId(baseStyleId: number, cell: Cell, border?: XlsxCellBorder): number;
     private fontId;
     private fillId;

package/dist/internal/features/work/work-xlsx-cell-styles.d.ts

@@ -1,10 +1,12 @@
 import type { Cell, Sheet } from '@fortune-sheet/core';
 import { type XlsxCellBorder } from './work-xlsx-cell-borders';
 import { type XlsxDirectCellStyleWriter } from './work-xlsx-cell-style-writer';
+import { type XlsxCellStyleOrigin } from './work-xlsx-cell-style-origin';
 export { XlsxDirectCellStyleWriter } from './work-xlsx-cell-style-writer';
 export interface XlsxDirectCellStyle {
     border?: XlsxCellBorder;
     column: number;
+    origin?: XlsxCellStyleOrigin;
     row: number;
     style: Partial<Cell>;
 }

package/dist/styles.css

@@ -5008,6 +5008,47 @@ html[data-ds-resizing="horizontal"], html[data-ds-resizing="horizontal"] * {
   padding: 8px;
 }
 
+.work-office-color-reset {
+  border: 0;
+  border-bottom: 1px solid var(--a3s-line);
+  width: 100%;
+  min-height: 30px;
+  color: var(--a3s-ink);
+  font: inherit;
+  text-align: start;
+  cursor: pointer;
+  background: none;
+  outline: 0;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 7px;
+  padding: 4px 6px 7px;
+  font-size: 10px;
+  display: flex;
+}
+
+.work-office-color-reset:hover, .work-office-color-reset:focus-visible {
+  background: var(--a3s-panel-soft);
+  color: var(--work-office-control-accent, var(--a3s-blue));
+}
+
+.work-office-color-reset-swatch {
+  border: 1px solid var(--a3s-line-strong);
+  background: var(--a3s-panel);
+  width: 19px;
+  height: 16px;
+  color: var(--a3s-red);
+  border-radius: 3px;
+  flex: 0 0 19px;
+  place-items: center;
+  display: grid;
+}
+
+.work-office-color-reset[data-kind="automatic"] .work-office-color-reset-swatch {
+  box-shadow: inset 0 0 0 2px var(--a3s-panel);
+  background: #111827;
+}
+
 .work-office-color-palette {
   gap: 6px;
   display: grid;
@@ -5142,6 +5183,20 @@ html[data-ds-resizing="horizontal"], html[data-ds-resizing="horizontal"] * {
     gap: 7px;
   }
 
+  .work-office-color-reset {
+    border-radius: 7px 7px 0 0;
+    min-height: 44px;
+    margin-bottom: 8px;
+    padding: 8px 9px 9px;
+    font-size: 11px;
+  }
+
+  .work-office-color-reset-swatch {
+    flex-basis: 24px;
+    width: 24px;
+    height: 20px;
+  }
+
   .work-office-color-section-title {
     font-size: 10px;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a3s-lab/office",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Open-source collaborative browser editors for documents, Markdown, spreadsheets, presentations, and PDFs.",
   "keywords": [
     "office",
@@ -88,6 +88,7 @@
     "playground:typecheck": "tsc --noEmit -p playground/tsconfig.json",
     "playground:visual": "playwright test --config playwright.config.ts",
     "playground:visual:spreadsheet-data-validation": "playwright test visual-tests/spreadsheet-data-validation.functional.spec.ts --config playwright.config.ts",
+    "playground:visual:spreadsheet-font-colors-shortcuts": "playwright test visual-tests/spreadsheet-font-colors-shortcuts.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-hyperlink": "playwright test visual-tests/spreadsheet-hyperlink.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-ribbon": "playwright test visual-tests/spreadsheet-ribbon.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-underline": "playwright test visual-tests/spreadsheet-underline.functional.spec.ts --config playwright.config.ts",
@@ -136,6 +137,8 @@
     "test:e2e:spreadsheet-ribbon:check": "a3s-test check tests/e2e/spreadsheet-ribbon-alignment.acl --json",
     "test:e2e:spreadsheet-orientation-visibility": "a3s-test run tests/e2e/spreadsheet-ribbon-orientation-visibility.acl --json",
     "test:e2e:spreadsheet-orientation-visibility:check": "a3s-test check tests/e2e/spreadsheet-ribbon-orientation-visibility.acl --json",
+    "test:e2e:spreadsheet-font-colors-shortcuts": "a3s-test run tests/e2e/spreadsheet-font-colors-shortcuts.acl --json",
+    "test:e2e:spreadsheet-font-colors-shortcuts:check": "a3s-test check tests/e2e/spreadsheet-font-colors-shortcuts.acl --json",
     "test:e2e:spreadsheet-cell-style": "a3s-test run tests/e2e/spreadsheet-cell-style.acl --json",
     "test:e2e:spreadsheet-cell-style:check": "a3s-test check tests/e2e/spreadsheet-cell-style.acl --json",
     "test:e2e:spreadsheet-font-size-border-shortcuts": "a3s-test run tests/e2e/spreadsheet-font-size-border-shortcuts.acl --json",