@jvs-milkdown/crepe 1.2.13 → 1.2.15

package/lib/types/core/builder.d.ts

@@ -23,6 +23,8 @@ export declare class CrepeBuilder {
     get readonly(): boolean;
     setReadonly: (value: boolean) => this;
     getMarkdown: () => string;
+    showDiff: (oldMarkdown: string, newMarkdown: string) => this;
+    hideDiff: () => this;
     on: (fn: (api: ListenerManager) => void) => this;
 }
 //# sourceMappingURL=builder.d.ts.map

package/lib/types/core/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/core/builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EAEjB,MAAM,EAKP,MAAM,wBAAwB,CAAA;AAI/B,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,mCAAmC,CAAA;AAO1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAU7D,MAAM,WAAW,kBAAkB;IAIjC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAAA;IAG3B,YAAY,CAAC,EAAE,YAAY,CAAA;IAG3B,MAAM,CAAC,EAAE,MAAM,CAAA;IAGf,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAA;CAC1D;AAID,qBAAa,YAAY;;gBAYX,EACV,IAAI,EACJ,YAAiB,EACjB,MAAgB,EAChB,YAAY,GACb,GAAE,kBAAuB;IA0H1B,UAAU,EAAE;QACV,CAAC,CAAC,SAAS,YAAY,EACrB,OAAO,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC7B,YAAY,CAAA;QACf,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,YAAY,CAAA;KACzD,CAGA;IAGD,MAAM,wBAEL;IAGD,OAAO,wBAEN;IAGD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAGD,IAAI,QAAQ,YAEX;IAGD,WAAW,GAAI,OAAO,OAAO,UAW5B;IAGD,WAAW,eAEV;IAGD,EAAE,GAAI,IAAI,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,UAavC;CACF"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/core/builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EAEjB,MAAM,EAKP,MAAM,wBAAwB,CAAA;AAI/B,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,mCAAmC,CAAA;AAO1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAGzC,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAU7D,MAAM,WAAW,kBAAkB;IAIjC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAAA;IAG3B,YAAY,CAAC,EAAE,YAAY,CAAA;IAG3B,MAAM,CAAC,EAAE,MAAM,CAAA;IAGf,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAA;CAC1D;AAID,qBAAa,YAAY;;gBAYX,EACV,IAAI,EACJ,YAAiB,EACjB,MAAgB,EAChB,YAAY,GACb,GAAE,kBAAuB;IA0H1B,UAAU,EAAE;QACV,CAAC,CAAC,SAAS,YAAY,EACrB,OAAO,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC7B,YAAY,CAAA;QACf,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,YAAY,CAAA;KACzD,CAGA;IAGD,MAAM,wBAEL;IAGD,OAAO,wBAEN;IAGD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAGD,IAAI,QAAQ,YAEX;IAGD,WAAW,GAAI,OAAO,OAAO,UAW5B;IAGD,WAAW,eAEV;IAGD,QAAQ,GAAI,aAAa,MAAM,EAAE,aAAa,MAAM,UAMnD;IAGD,QAAQ,aAMP;IAGD,EAAE,GAAI,IAAI,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,UAavC;CACF"}

package/lib/types/core/locale.d.ts

@@ -140,6 +140,8 @@ export declare const zhCN: {
     'shortcuts.history': string;
     'shortcuts.undo': string;
     'shortcuts.redo': string;
+    'inlineDiff.accept': string;
+    'inlineDiff.reject': string;
 };
 export declare const enUS: typeof zhCN;
 export type CrepeTranslations = typeof zhCN;
@@ -284,6 +286,8 @@ export declare const translationsCtx: import("@jvs-milkdown/ctx").SliceType<Reco
     'shortcuts.history': string;
     'shortcuts.undo': string;
     'shortcuts.redo': string;
+    'inlineDiff.accept': string;
+    'inlineDiff.reject': string;
 }>>, string>;
 export declare const localeCtx: import("@jvs-milkdown/ctx").SliceType<string, "localeCtx">;
 export declare function i18n(ctx: Ctx, key: keyof CrepeTranslations): string;

package/lib/types/core/locale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locale.d.ts","sourceRoot":"","sources":["../../../src/core/locale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAIhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2KhB,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,OAAO,IA4JzB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,OAAO,IAAI,CAAA;AAE3C,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAQ3B,CAAA;AAED,eAAO,MAAM,SAAS,4DAAoC,CAAA;AAE1D,wBAAgB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,iBAAiB,GAAG,MAAM,CASnE"}
+{"version":3,"file":"locale.d.ts","sourceRoot":"","sources":["../../../src/core/locale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAIhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+KhB,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,OAAO,IA+JzB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,OAAO,IAAI,CAAA;AAE3C,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAQ3B,CAAA;AAED,eAAO,MAAM,SAAS,4DAAoC,CAAA;AAE1D,wBAAgB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,iBAAiB,GAAG,MAAM,CASnE"}

package/lib/types/feature/diff-block/index.d.ts

@@ -0,0 +1,10 @@
+import type { Extension } from '@codemirror/state';
+import { type DiffBlockConfig } from '@jvs-milkdown/kit/component/diff-block';
+import type { DefineFeature } from '../shared';
+interface DiffBlockConfigCustom extends Omit<DiffBlockConfig, 'theme'> {
+    theme: Extension;
+}
+export type DiffBlockFeatureConfig = Partial<DiffBlockConfigCustom>;
+export declare const diffBlockFeature: DefineFeature<DiffBlockFeatureConfig>;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/lib/types/feature/diff-block/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/feature/diff-block/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGlD,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,wCAAwC,CAAA;AAG/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAK9C,UAAU,qBAAsB,SAAQ,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC;IACpE,KAAK,EAAE,SAAS,CAAA;CACjB;AAED,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAEnE,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,sBAAsB,CA0BlE,CAAA"}

package/lib/types/feature/fixed-toolbar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/feature/fixed-toolbar/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,SAAS,EAAiB,MAAM,+BAA+B,CAAA;AAchF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAUpD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAA;IAC3D,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/C,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC9B;AAED,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAEnE,eAAO,MAAM,kBAAkB,0FAG9B,CAAA;AAED,eAAO,MAAM,eAAe,gBAA0C,CAAA;AA8PtE,eAAO,MAAM,kBAAkB,sCAK7B,CAAA;AAEF,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,yBAAyB,CA2BjE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/feature/fixed-toolbar/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,SAAS,EAAiB,MAAM,+BAA+B,CAAA;AAchF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAYpD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAA;IAC3D,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/C,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC9B;AAED,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAEnE,eAAO,MAAM,kBAAkB,0FAG9B,CAAA;AAED,eAAO,MAAM,eAAe,gBAA0C,CAAA;AAiStE,eAAO,MAAM,kBAAkB,sCAK7B,CAAA;AAEF,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,yBAAyB,CA6BjE,CAAA"}

package/lib/types/feature/fixed-toolbar/outline-panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outline-panel.d.ts","sourceRoot":"","sources":["../../../../src/feature/fixed-toolbar/outline-panel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAgBhD,eAAO,MAAM,YAAY;;cAEE,MAAM,GAAG;;;;;cAAT,MAAM,GAAG;;;+GA6clC,CAAA"}
+{"version":3,"file":"outline-panel.d.ts","sourceRoot":"","sources":["../../../../src/feature/fixed-toolbar/outline-panel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAgBhD,eAAO,MAAM,YAAY;;cAEE,MAAM,GAAG;;;;;cAAT,MAAM,GAAG;;;+GA+clC,CAAA"}

package/lib/types/feature/index.d.ts

@@ -2,8 +2,10 @@ import type { AttachmentFeatureConfig } from './attachment/config';
 import type { BlockEditFeatureConfig } from './block-edit';
 import type { CodeMirrorFeatureConfig } from './code-mirror';
 import type { CursorFeatureConfig } from './cursor';
+import type { DiffBlockFeatureConfig } from './diff-block';
 import type { FixedToolbarFeatureConfig } from './fixed-toolbar';
 import type { ImageBlockFeatureConfig } from './image-block';
+import type { InlineDiffFeatureConfig } from './inline-diff';
 import type { LatexFeatureConfig } from './latex';
 import type { LinkTooltipFeatureConfig } from './link-tooltip';
 import type { ListItemFeatureConfig } from './list-item';
@@ -22,7 +24,9 @@ export declare enum CrepeFeature {
     Placeholder = "placeholder",
     Table = "table",
     Latex = "latex",
-    Attachment = "attachment"
+    Attachment = "attachment",
+    InlineDiff = "inline-diff",
+    DiffBlock = "diff-block"
 }
 export interface CrepeFeatureConfig {
     [CrepeFeature.Cursor]?: CursorFeatureConfig;
@@ -37,6 +41,8 @@ export interface CrepeFeatureConfig {
     [CrepeFeature.Table]?: TableFeatureConfig;
     [CrepeFeature.Latex]?: LatexFeatureConfig;
     [CrepeFeature.Attachment]?: AttachmentFeatureConfig;
+    [CrepeFeature.InlineDiff]?: InlineDiffFeatureConfig;
+    [CrepeFeature.DiffBlock]?: DiffBlockFeatureConfig;
 }
 export declare const defaultFeatures: Record<CrepeFeature, boolean>;
 //# sourceMappingURL=index.d.ts.map

package/lib/types/feature/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/feature/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAKrD,oBAAY,YAAY;IAEtB,UAAU,gBAAgB;IAG1B,QAAQ,cAAc;IAGtB,WAAW,iBAAiB;IAG5B,MAAM,WAAW;IAGjB,UAAU,gBAAgB;IAG1B,SAAS,eAAe;IAGxB,OAAO,YAAY;IAGnB,YAAY,kBAAkB;IAG9B,WAAW,gBAAgB;IAG3B,KAAK,UAAU;IAGf,KAAK,UAAU;IAGf,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,CAAA;IAC3C,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,qBAAqB,CAAA;IAC/C,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,wBAAwB,CAAA;IACrD,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;IACnD,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,sBAAsB,CAAA;IACjD,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,wBAAwB,CAAA;IACrD,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,oBAAoB,CAAA;IAC7C,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,EAAE,yBAAyB,CAAA;IACvD,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;IACnD,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAA;IACzC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAA;IACzC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;CACpD;AAED,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE,OAAO,CAazD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/feature/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAKrD,oBAAY,YAAY;IAEtB,UAAU,gBAAgB;IAG1B,QAAQ,cAAc;IAGtB,WAAW,iBAAiB;IAG5B,MAAM,WAAW;IAGjB,UAAU,gBAAgB;IAG1B,SAAS,eAAe;IAGxB,OAAO,YAAY;IAGnB,YAAY,kBAAkB;IAG9B,WAAW,gBAAgB;IAG3B,KAAK,UAAU;IAGf,KAAK,UAAU;IAGf,UAAU,eAAe;IAGzB,UAAU,gBAAgB;IAG1B,SAAS,eAAe;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,CAAA;IAC3C,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,qBAAqB,CAAA;IAC/C,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,wBAAwB,CAAA;IACrD,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;IACnD,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,sBAAsB,CAAA;IACjD,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,wBAAwB,CAAA;IACrD,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,oBAAoB,CAAA;IAC7C,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,EAAE,yBAAyB,CAAA;IACvD,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;IACnD,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAA;IACzC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAA;IACzC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;IACnD,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,uBAAuB,CAAA;IACnD,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,sBAAsB,CAAA;CAClD;AAED,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE,OAAO,CAezD,CAAA"}

package/lib/types/feature/inline-diff/change-panel.d.ts

@@ -0,0 +1,4 @@
+import { type App as VueApp } from 'vue';
+import type { ChangeInfo } from './doc-builder';
+export declare function mountChangePanel(container: HTMLElement, changes: ChangeInfo[], onNavigate: (from: number) => void, onClose?: () => void): VueApp;
+//# sourceMappingURL=change-panel.d.ts.map

package/lib/types/feature/inline-diff/change-panel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-panel.d.ts","sourceRoot":"","sources":["../../../../src/feature/inline-diff/change-panel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,GAAG,IAAI,MAAM,EAAE,MAAM,KAAK,CAAA;AAErE,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,eAAe,CAAA;AAa3D,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,UAAU,EAAE,EACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAClC,OAAO,CAAC,EAAE,MAAM,IAAI,GACnB,MAAM,CAmQR"}

package/lib/types/feature/inline-diff/config.d.ts

@@ -0,0 +1,12 @@
+export interface InlineDiffConfig {
+    addedClass: string;
+    deletedClass: string;
+}
+export interface InlineDiffApi {
+    showDiff: (oldMarkdown: string, newMarkdown?: string) => void;
+    hideDiff: () => void;
+    isShowing: () => boolean;
+}
+export declare const inlineDiffConfig: import("@jvs-milkdown/utils").$Ctx<InlineDiffConfig, "inlineDiffConfigCtx">;
+export declare const inlineDiffApiCtx: import("@jvs-milkdown/utils").$Ctx<InlineDiffApi, "inlineDiffApiCtx">;
+//# sourceMappingURL=config.d.ts.map

package/lib/types/feature/inline-diff/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/feature/inline-diff/config.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7D,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,SAAS,EAAE,MAAM,OAAO,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,6EAM5B,CAAA;AAQD,eAAO,MAAM,gBAAgB,uEAAoC,CAAA"}

package/lib/types/feature/inline-diff/diff-engine.d.ts

@@ -0,0 +1,20 @@
+import type { Node as PMNode } from '@jvs-milkdown/kit/prose/model';
+export type DiffType = 'unchanged' | 'added' | 'removed';
+export interface CharPart {
+    type: 'equal' | 'insert' | 'delete';
+    value: string;
+}
+export interface BlockDiff {
+    type: DiffType;
+    oldNode?: PMNode;
+    newNode?: PMNode;
+    parts?: CharPart[];
+}
+export type ChunkStatus = 'pending' | 'accepted' | 'rejected';
+export interface DiffChunk {
+    id: string;
+    diffs: BlockDiff[];
+    status: ChunkStatus;
+}
+export declare function computeDiff(oldBlocks: PMNode[], newBlocks: PMNode[]): DiffChunk[];
+//# sourceMappingURL=diff-engine.d.ts.map

package/lib/types/feature/inline-diff/diff-engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-engine.d.ts","sourceRoot":"","sources":["../../../../src/feature/inline-diff/diff-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAInE,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAA;AAExD,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACnC,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,QAAQ,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAA;CACnB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,CAAA;AAE7D,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,SAAS,EAAE,CAAA;IAClB,MAAM,EAAE,WAAW,CAAA;CACpB;AAyCD,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EAAE,GAClB,SAAS,EAAE,CAgHb"}

package/lib/types/feature/inline-diff/diff-view.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=diff-view.d.ts.map

package/lib/types/feature/inline-diff/diff-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-view.d.ts","sourceRoot":"","sources":["../../../../src/feature/inline-diff/diff-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAA"}

package/lib/types/feature/inline-diff/doc-builder.d.ts

@@ -0,0 +1,21 @@
+import type { Schema, Node as PMNode } from '@jvs-milkdown/kit/prose/model';
+import type { DiffChunk } from './diff-engine';
+export type ChangeType = 'added' | 'removed';
+export interface ContentRange {
+    from: number;
+    to: number;
+}
+export interface ChangeInfo {
+    type: ChangeType;
+    from: number;
+    oldText: string;
+    newText: string;
+    blockRange: ContentRange;
+    inlineRanges: ContentRange[];
+    chunkId: string;
+}
+export declare function buildNewDoc(chunks: DiffChunk[], schema: Schema): {
+    doc: PMNode;
+    changes: ChangeInfo[];
+};
+//# sourceMappingURL=doc-builder.d.ts.map

package/lib/types/feature/inline-diff/doc-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doc-builder.d.ts","sourceRoot":"","sources":["../../../../src/feature/inline-diff/doc-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAY,MAAM,eAAe,CAAA;AAExD,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,SAAS,CAAA;AAE5C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,UAAU,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,YAAY,CAAA;IACxB,YAAY,EAAE,YAAY,EAAE,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAA;CAChB;AAWD,wBAAgB,WAAW,CACzB,MAAM,EAAE,SAAS,EAAE,EACnB,MAAM,EAAE,MAAM,GACb;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,UAAU,EAAE,CAAA;CAAE,CAyGxC"}

package/lib/types/feature/inline-diff/index.d.ts

@@ -0,0 +1,9 @@
+import { PluginKey } from '@jvs-milkdown/kit/prose/state';
+import type { DefineFeature } from '../shared';
+import { inlineDiffApiCtx, type InlineDiffConfig, type InlineDiffApi } from './config';
+export type InlineDiffFeatureConfig = Partial<InlineDiffConfig>;
+export { inlineDiffApiCtx, type InlineDiffApi };
+export declare const inlineDiffKey: PluginKey<any>;
+export declare const inlineDiffPlugin: import("@jvs-milkdown/utils").$Prose;
+export declare const inlineDiff: DefineFeature<InlineDiffFeatureConfig>;
+//# sourceMappingURL=index.d.ts.map

package/lib/types/feature/inline-diff/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/feature/inline-diff/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAU,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAIjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAM9C,OAAO,EAEL,gBAAgB,EAChB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EACnB,MAAM,UAAU,CAAA;AAIjB,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,CAAA;AAE/C,eAAO,MAAM,aAAa,gBAAqC,CAAA;AAyc/D,eAAO,MAAM,gBAAgB,sCAQ3B,CAAA;AAEF,eAAO,MAAM,UAAU,EAAE,aAAa,CAAC,uBAAuB,CAiB7D,CAAA"}

package/lib/types/feature/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/feature/loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAQpD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAQtC,wBAAgB,WAAW,CACzB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,KAAK,QAwCf"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/feature/loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AASpD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAStC,wBAAgB,WAAW,CACzB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,KAAK,QA8Cf"}

package/lib/types/feature/toolbar/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../src/feature/toolbar/component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAehD,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,+BAA+B,CAAA;AAUtC,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,UAAU,EAQhB,MAAM,KAAK,CAAA;AAEZ,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAA;AAmG7C,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;IAClB,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;IAChC,MAAM,CAAC,EAAE,oBAAoB,CAAA;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAeD,eAAO,MAAM,OAAO,0WAw9ElB,CAAA"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../src/feature/toolbar/component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAehD,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,+BAA+B,CAAA;AAUtC,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,UAAU,EAQhB,MAAM,KAAK,CAAA;AAEZ,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAA;AAmG7C,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;IAClB,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;IAChC,MAAM,CAAC,EAAE,oBAAoB,CAAA;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAeD,eAAO,MAAM,OAAO,0WAy9ElB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jvs-milkdown/crepe",
-  "version": "1.2.13",
+  "version": "1.2.15",
   "keywords": [
     "crepe",
     "editor",
@@ -81,6 +81,16 @@
       "require": "./lib/cjs/feature/toolbar/index.js",
       "types": "./lib/types/feature/toolbar/index.d.ts"
     },
+    "./feature/inline-diff": {
+      "import": "./lib/esm/feature/inline-diff/index.js",
+      "require": "./lib/cjs/feature/inline-diff/index.js",
+      "types": "./lib/types/feature/inline-diff/index.d.ts"
+    },
+    "./feature/diff-block": {
+      "import": "./lib/esm/feature/diff-block/index.js",
+      "require": "./lib/cjs/feature/diff-block/index.js",
+      "types": "./lib/types/feature/diff-block/index.d.ts"
+    },
     "./theme/common/*": "./lib/theme/common/*",
     "./theme/classic.css": "./lib/theme/crepe/style.css",
     "./theme/classic-dark.css": "./lib/theme/crepe-dark/style.css",
@@ -97,12 +107,13 @@
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.26.0",
     "@floating-ui/dom": "^1.7.6",
-    "@jvs-milkdown/kit": "^1.2.13",
-    "@jvs-milkdown/prose": "^1.2.13",
-    "@jvs-milkdown/utils": "^1.2.13",
+    "@jvs-milkdown/kit": "^1.2.15",
+    "@jvs-milkdown/prose": "^1.2.15",
+    "@jvs-milkdown/utils": "^1.2.15",
     "@types/lodash-es": "^4.17.12",
     "clsx": "^2.0.0",
     "codemirror": "^6.0.1",
+    "diff": "^9.0.0",
     "katex": "^0.16.0",
     "lodash-es": "^4.17.21",
     "prosemirror-virtual-cursor": "^0.4.2",

package/src/core/builder.ts

@@ -27,6 +27,7 @@ import type { DefineFeature } from '../feature/shared'
 
 import { CrepeFeature } from '../feature'
 import { attachmentConfig } from '../feature/attachment/config'
+import { inlineDiffApiCtx } from '../feature/inline-diff/config'
 import { zhCN, enUS, type CrepeTranslations } from './locale'
 import {
   CrepeCtx,
@@ -244,6 +245,24 @@ export class CrepeBuilder {
     return this.#editor.action(getMarkdown())
   }
 
+  /// Show inline diff between two markdown versions.
+  showDiff = (oldMarkdown: string, newMarkdown: string) => {
+    this.#editor.action((ctx) => {
+      const api = ctx.get(inlineDiffApiCtx.key)
+      api.showDiff(oldMarkdown, newMarkdown)
+    })
+    return this
+  }
+
+  /// Hide inline diff and return to editing mode.
+  hideDiff = () => {
+    this.#editor.action((ctx) => {
+      const api = ctx.get(inlineDiffApiCtx.key)
+      api.hideDiff()
+    })
+    return this
+  }
+
   /// Register event listeners.
   on = (fn: (api: ListenerManager) => void) => {
     if (this.#editor.status !== EditorStatus.Created) {

package/src/core/locale.ts

@@ -173,6 +173,10 @@ export const zhCN = {
   'shortcuts.history': '历史记录',
   'shortcuts.undo': '撤销',
   'shortcuts.redo': '重做',
+
+  // inline-diff
+  'inlineDiff.accept': '接受',
+  'inlineDiff.reject': '拒绝',
 }
 
 export const enUS: typeof zhCN = {
@@ -331,6 +335,9 @@ export const enUS: typeof zhCN = {
   'shortcuts.history': 'History',
   'shortcuts.undo': 'Undo',
   'shortcuts.redo': 'Redo',
+
+  'inlineDiff.accept': 'Accept',
+  'inlineDiff.reject': 'Reject',
 }
 
 export type CrepeTranslations = typeof zhCN

package/src/feature/diff-block/index.ts

@@ -0,0 +1,48 @@
+import type { Extension } from '@codemirror/state'
+
+import { oneDark } from '@codemirror/theme-one-dark'
+import {
+  diffBlock,
+  diffBlockConfig,
+  type DiffBlockConfig,
+} from '@jvs-milkdown/kit/component/diff-block'
+import { basicSetup } from 'codemirror'
+
+import type { DefineFeature } from '../shared'
+
+import { crepeFeatureConfig } from '../../core/slice'
+import { CrepeFeature } from '../index'
+
+interface DiffBlockConfigCustom extends Omit<DiffBlockConfig, 'theme'> {
+  theme: Extension
+}
+
+export type DiffBlockFeatureConfig = Partial<DiffBlockConfigCustom>
+
+export const diffBlockFeature: DefineFeature<DiffBlockFeatureConfig> = (
+  editor,
+  config = {}
+) => {
+  editor
+    .config(crepeFeatureConfig(CrepeFeature.DiffBlock))
+    .config((ctx) => {
+      const { languages = [], theme } = config
+      const extensions = [basicSetup]
+      if (theme) {
+        extensions.push(theme)
+      } else {
+        extensions.push(oneDark)
+      }
+      if (config.extensions) {
+        extensions.push(...config.extensions)
+      }
+
+      ctx.update(diffBlockConfig.key, (defaultConfig) => ({
+        ...defaultConfig,
+        extensions,
+        languages: languages.length > 0 ? languages : defaultConfig.languages,
+        renderLanguage: config.renderLanguage || defaultConfig.renderLanguage,
+      }))
+    })
+    .use(diffBlock)
+}

package/src/feature/fixed-toolbar/index.ts

@@ -22,6 +22,8 @@ import type { ToolbarItem } from '../toolbar/config'
 
 import { crepeFeatureConfig } from '../../core/slice'
 import { CrepeFeature } from '../index'
+import { highlightMark } from '../toolbar/highlight-mark'
+import { underline } from '../toolbar/underline'
 import { FixedToolbarComponent } from './component'
 import { buildDefaultFixedToolbar } from './config'
 import { DocumentHeader } from './document-header'
@@ -68,6 +70,7 @@ class FixedToolbarView implements PluginView {
   #scrollContainers: Element[] = []
   #onDblClick: ((event: MouseEvent) => void) | undefined
   #view: EditorView
+  #editorContainer?: HTMLElement
 
   constructor(ctx: Ctx, view: EditorView) {
     this.#view = view
@@ -91,16 +94,25 @@ class FixedToolbarView implements PluginView {
     if (root) {
       root.style.position = 'relative'
       // Use internal styles for transition for smooth resizing
-      root.style.transition =
-        'padding 0.1s ease-out, background-color 0.2s ease-out'
+      root.style.transition = 'background-color 0.2s ease-out'
 
       root.prepend(this.#content)
 
+      const editorContainer = document.createElement('div')
+      editorContainer.className = 'milkdown-editor-container'
+      editorContainer.style.transition = 'padding 0.1s ease-out'
+      editorContainer.style.display = 'flex'
+      editorContainer.style.flexDirection = 'column'
+      editorContainer.style.flexGrow = '1'
+      root.insertBefore(editorContainer, view.dom)
+      editorContainer.appendChild(view.dom)
+      this.#editorContainer = editorContainer
+
       const headerContent = document.createElement('div')
       this.#headerApp = createApp(DocumentHeader, { ctx, config })
       this.#headerApp.mount(headerContent)
       this.#headerContent = headerContent
-      root.insertBefore(headerContent, view.dom)
+      editorContainer.insertBefore(headerContent, view.dom)
 
       const outlineContent = document.createElement('div')
       outlineContent.style.position = 'fixed'
@@ -189,7 +201,29 @@ class FixedToolbarView implements PluginView {
             outlineContent.style.right = 'auto'
           } else {
             outlineContent.style.left = 'auto'
-            outlineContent.style.right = `${window.innerWidth - rootRect.right}px`
+            let baseOffset = window.innerWidth - rootRect.right
+            let rightOffset = baseOffset
+            let hasVScroll = false
+            if (document.documentElement.scrollHeight > window.innerHeight) {
+              hasVScroll = true
+            }
+            let parent: HTMLElement | null = root
+            while (parent && parent !== document.body) {
+              const { overflowY } = getComputedStyle(parent)
+              if (overflowY === 'auto' || overflowY === 'scroll') {
+                if (parent.scrollHeight > parent.clientHeight) {
+                  hasVScroll = true
+                  break
+                }
+              }
+              parent = parent.parentElement
+            }
+            if (hasVScroll) {
+              rightOffset = Math.max(rightOffset, 32)
+            } else {
+              rightOffset = Math.max(rightOffset, 0)
+            }
+            outlineContent.style.right = `${rightOffset}px`
           }
         }
       }
@@ -231,26 +265,26 @@ class FixedToolbarView implements PluginView {
             root.style.backgroundColor = ''
           }
 
-          if (viewState.outlineVisible) {
-            if (viewState.outlinePosition === 'left') {
-              root.style.paddingLeft = `${viewState.outlineWidth}px`
-              root.style.paddingRight = '0'
-              this.#content.style.width = `calc(100% + ${viewState.outlineWidth}px)`
-              this.#content.style.marginLeft = `-${viewState.outlineWidth}px`
-              this.#content.style.marginRight = '0'
+          // Reset root and toolbar styles to default/full-width
+          root.style.paddingLeft = '0'
+          root.style.paddingRight = '0'
+          this.#content.style.width = '100%'
+          this.#content.style.marginLeft = '0'
+          this.#content.style.marginRight = '0'
+
+          if (this.#editorContainer) {
+            if (viewState.outlineVisible) {
+              if (viewState.outlinePosition === 'left') {
+                this.#editorContainer.style.paddingLeft = `${viewState.outlineWidth}px`
+                this.#editorContainer.style.paddingRight = '0'
+              } else {
+                this.#editorContainer.style.paddingLeft = '0'
+                this.#editorContainer.style.paddingRight = `${viewState.outlineWidth}px`
+              }
             } else {
-              root.style.paddingLeft = '0'
-              root.style.paddingRight = `${viewState.outlineWidth}px`
-              this.#content.style.width = `calc(100% + ${viewState.outlineWidth}px)`
-              this.#content.style.marginLeft = '0'
-              this.#content.style.marginRight = `-${viewState.outlineWidth}px`
+              this.#editorContainer.style.paddingLeft = '0'
+              this.#editorContainer.style.paddingRight = '0'
             }
-          } else {
-            root.style.paddingLeft = '0'
-            root.style.paddingRight = '0'
-            this.#content.style.width = '100%'
-            this.#content.style.marginLeft = '0'
-            this.#content.style.marginRight = '0'
           }
 
           const maxWidth = (editorWidthMap as any)[viewState.editorWidth]
@@ -269,8 +303,11 @@ class FixedToolbarView implements PluginView {
           }
 
           // Compute geometry after styles and DOM (cover) are updated
-          nextTick(() => {
+          void nextTick(() => {
             this.#updateOutlineGeometry?.()
+            setTimeout(() => {
+              this.#updateOutlineGeometry?.()
+            }, 100)
           })
         },
         { immediate: true }
@@ -338,5 +375,7 @@ export const fixedToolbar: DefineFeature<FixedToolbarFeatureConfig> = (
     })
     .use(viewMenuStateCtx)
     .use(fixedToolbarConfig)
+    .use(underline as any)
+    .use(highlightMark as any)
     .use(fixedToolbarPlugin)
 }

package/src/feature/fixed-toolbar/outline-panel.tsx

@@ -263,7 +263,8 @@ export const OutlinePanel = defineComponent({
             width: `${state.outlineWidth}px`,
             minWidth: '200px',
             maxWidth: '400px',
-            backgroundColor: 'var(--crepe-color-surface)',
+            backgroundColor:
+              state.documentBackground || 'var(--crepe-color-background)',
             borderRight: isLeft
               ? '1px solid var(--crepe-color-outline-variant, color-mix(in srgb, var(--crepe-color-outline), transparent 80%))'
               : 'none',
@@ -283,11 +284,12 @@ export const OutlinePanel = defineComponent({
           {/* Header */}
           <div
             style={{
-              padding: '20px 16px',
+              padding: '12px 16px',
               fontWeight: 'bold',
               fontSize: '14px',
               color: 'var(--crepe-color-on-surface)',
-              borderBottom: '1px solid var(--crepe-color-outline-variant)',
+              borderBottom:
+                '1px solid var(--crepe-color-outline-variant, color-mix(in srgb, var(--crepe-color-outline, #ddd), transparent 80%))',
               display: 'flex',
               justifyContent: 'space-between',
               alignItems: 'center',

package/src/feature/index.ts

@@ -2,8 +2,10 @@ import type { AttachmentFeatureConfig } from './attachment/config'
 import type { BlockEditFeatureConfig } from './block-edit'
 import type { CodeMirrorFeatureConfig } from './code-mirror'
 import type { CursorFeatureConfig } from './cursor'
+import type { DiffBlockFeatureConfig } from './diff-block'
 import type { FixedToolbarFeatureConfig } from './fixed-toolbar'
 import type { ImageBlockFeatureConfig } from './image-block'
+import type { InlineDiffFeatureConfig } from './inline-diff'
 import type { LatexFeatureConfig } from './latex'
 import type { LinkTooltipFeatureConfig } from './link-tooltip'
 import type { ListItemFeatureConfig } from './list-item'
@@ -50,6 +52,12 @@ export enum CrepeFeature {
 
   /// File attachment uploads
   Attachment = 'attachment',
+
+  /// Inline diff comparison between two document versions, similar to Word track changes.
+  InlineDiff = 'inline-diff',
+
+  /// Diff comparison block for showing code differences
+  DiffBlock = 'diff-block',
 }
 
 export interface CrepeFeatureConfig {
@@ -65,6 +73,8 @@ export interface CrepeFeatureConfig {
   [CrepeFeature.Table]?: TableFeatureConfig
   [CrepeFeature.Latex]?: LatexFeatureConfig
   [CrepeFeature.Attachment]?: AttachmentFeatureConfig
+  [CrepeFeature.InlineDiff]?: InlineDiffFeatureConfig
+  [CrepeFeature.DiffBlock]?: DiffBlockFeatureConfig
 }
 
 export const defaultFeatures: Record<CrepeFeature, boolean> = {
@@ -80,4 +90,6 @@ export const defaultFeatures: Record<CrepeFeature, boolean> = {
   [CrepeFeature.Table]: true,
   [CrepeFeature.Latex]: true,
   [CrepeFeature.Attachment]: true,
+  [CrepeFeature.InlineDiff]: false,
+  [CrepeFeature.DiffBlock]: true,
 }