modern-text 0.5.13 → 0.6.1

package/dist/index.d.mts

@@ -121,8 +121,6 @@ interface MeasureDomResult {
     boundingBox: BoundingBox;
 }
 declare class Measurer {
-    protected _text: Text;
-    constructor(_text: Text);
     protected _styleToDomStyle(style: Partial<TextStyle>): Record<string, any>;
     /**
      * <section style="...">
@@ -134,17 +132,24 @@ declare class Measurer {
      *   </ul>
      * </section>
      */
-    createDom(): {
+    createParagraphDom(paragraphs: Paragraph[], rootStyle: TextStyle): {
         dom: HTMLElement;
         destory: () => void;
     };
-    protected _measureDom(dom: HTMLElement): {
+    measureDomText(text: Text): {
+        content: string;
+        top: number;
+        left: number;
+        width: number;
+        height: number;
+    }[];
+    measureDom(dom: HTMLElement): {
         paragraphs: MeasuredParagraph[];
         fragments: MeasuredFragment[];
         characters: MeasuredCharacter[];
     };
-    measureDom(dom: HTMLElement): MeasureDomResult;
-    measure(dom?: HTMLElement): MeasureDomResult;
+    measureParagraphDom(paragraphs: Paragraph[], dom: HTMLElement): MeasureDomResult;
+    measure(paragraphs: Paragraph[], rootStyle: TextStyle, dom?: HTMLElement): MeasureDomResult;
 }
 
 interface TextRenderOptions {
@@ -162,19 +167,19 @@ interface MeasureResult {
 declare const defaultTextStyles: TextStyle;
 interface TextEventMap {
     update: {
-        text: Text;
+        text: Text$1;
     };
     measure: {
-        text: Text;
+        text: Text$1;
         result: MeasureResult;
     };
     render: {
-        text: Text;
+        text: Text$1;
         view: HTMLCanvasElement;
         pixelRatio: number;
     };
 }
-declare class Text extends EventEmitter<TextEventMap> {
+declare class Text$1 extends EventEmitter<TextEventMap> {
     debug: boolean;
     content: TextContent;
     style: Partial<TextStyle>;
@@ -201,14 +206,15 @@ declare class Text extends EventEmitter<TextEventMap> {
         fragmentIndex: number;
         characterIndex: number;
     }) => void): this;
+    load(): Promise<void>;
     updateParagraphs(): this;
-    measure(dom?: HTMLElement | undefined): Promise<MeasureResult>;
+    measure(dom?: HTMLElement | undefined): MeasureResult;
     getGlyphBox(): BoundingBox;
     updatePathBox(): this;
     updateBoundingBox(): this;
     requestUpdate(): this;
-    update(): Promise<void>;
-    render(options: TextRenderOptions): Promise<void>;
+    update(): this;
+    render(options: TextRenderOptions): void;
 }
 
 type Sizeable = `${number}%` | `${number}rem` | number;
@@ -286,15 +292,15 @@ interface ParagraphContent extends Partial<TextStyle> {
     fragments: FragmentContent[];
 }
 type TextContent = string | FragmentContent | ParagraphContent | (string | FragmentContent | ParagraphContent | (string | FragmentContent)[])[];
-type PromiseLike<T> = T | Promise<T>;
 interface TextPlugin {
     name: string;
     paths?: Path2D[];
-    getBoundingBox?: (text: Text) => BoundingBox | undefined;
+    getBoundingBox?: (text: Text$1) => BoundingBox | undefined;
+    update?: (text: Text$1) => void;
     updateOrder?: number;
-    update?: (text: Text) => PromiseLike<void>;
+    render?: (ctx: CanvasRenderingContext2D, text: Text$1) => void;
     renderOrder?: number;
-    render?: (ctx: CanvasRenderingContext2D, text: Text) => PromiseLike<void>;
+    load?: (text: Text$1) => Promise<void>;
 }
 interface TextOptions {
     debug?: boolean;
@@ -328,23 +334,23 @@ declare function drawPath(options: DrawShapePathsOptions): void;
 
 declare function setupView(ctx: CanvasRenderingContext2D, pixelRatio: number, boundingBox: BoundingBox): void;
 
-declare function uploadColors(ctx: CanvasRenderingContext2D, text: Text): void;
+declare function uploadColors(ctx: CanvasRenderingContext2D, text: Text$1): void;
 
 declare function definePlugin(options: TextPlugin): TextPlugin;
 
 declare function measureText(options: TextOptions): Promise<MeasureResult>;
 
+declare function renderText(options: TextOptions & TextRenderOptions): Promise<void>;
+
 declare function highlight(): TextPlugin;
 
 declare function listStyle(): TextPlugin;
 
 declare function render(): TextPlugin;
-declare function getTransform2D(text: Text, style: Partial<TextStyle>): Matrix3;
+declare function getTransform2D(text: Text$1, style: Partial<TextStyle>): Matrix3;
 
 declare function textDecoration(): TextPlugin;
 
-declare function renderText(options: TextOptions & TextRenderOptions): Promise<void>;
-
 interface ValueContext {
     total: number;
     fontSize: number;
@@ -356,5 +362,6 @@ declare function isEqualObject(obj1: Record<string, any>, obj2: Record<string, a
 declare function isEqualValue(val1: any, val2: any): boolean;
 declare function hexToRgb(hex: string): string | null;
 declare function filterEmpty(val: Record<string, any> | undefined): Record<string, any> | undefined;
+declare function needsFetch(source: string): boolean;
 
-export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type Sizeable, Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };
+export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type Sizeable, Text$1 as Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };

package/dist/index.d.ts

@@ -121,8 +121,6 @@ interface MeasureDomResult {
     boundingBox: BoundingBox;
 }
 declare class Measurer {
-    protected _text: Text;
-    constructor(_text: Text);
     protected _styleToDomStyle(style: Partial<TextStyle>): Record<string, any>;
     /**
      * <section style="...">
@@ -134,17 +132,24 @@ declare class Measurer {
      *   </ul>
      * </section>
      */
-    createDom(): {
+    createParagraphDom(paragraphs: Paragraph[], rootStyle: TextStyle): {
         dom: HTMLElement;
         destory: () => void;
     };
-    protected _measureDom(dom: HTMLElement): {
+    measureDomText(text: Text): {
+        content: string;
+        top: number;
+        left: number;
+        width: number;
+        height: number;
+    }[];
+    measureDom(dom: HTMLElement): {
         paragraphs: MeasuredParagraph[];
         fragments: MeasuredFragment[];
         characters: MeasuredCharacter[];
     };
-    measureDom(dom: HTMLElement): MeasureDomResult;
-    measure(dom?: HTMLElement): MeasureDomResult;
+    measureParagraphDom(paragraphs: Paragraph[], dom: HTMLElement): MeasureDomResult;
+    measure(paragraphs: Paragraph[], rootStyle: TextStyle, dom?: HTMLElement): MeasureDomResult;
 }
 
 interface TextRenderOptions {
@@ -162,19 +167,19 @@ interface MeasureResult {
 declare const defaultTextStyles: TextStyle;
 interface TextEventMap {
     update: {
-        text: Text;
+        text: Text$1;
     };
     measure: {
-        text: Text;
+        text: Text$1;
         result: MeasureResult;
     };
     render: {
-        text: Text;
+        text: Text$1;
         view: HTMLCanvasElement;
         pixelRatio: number;
     };
 }
-declare class Text extends EventEmitter<TextEventMap> {
+declare class Text$1 extends EventEmitter<TextEventMap> {
     debug: boolean;
     content: TextContent;
     style: Partial<TextStyle>;
@@ -201,14 +206,15 @@ declare class Text extends EventEmitter<TextEventMap> {
         fragmentIndex: number;
         characterIndex: number;
     }) => void): this;
+    load(): Promise<void>;
     updateParagraphs(): this;
-    measure(dom?: HTMLElement | undefined): Promise<MeasureResult>;
+    measure(dom?: HTMLElement | undefined): MeasureResult;
     getGlyphBox(): BoundingBox;
     updatePathBox(): this;
     updateBoundingBox(): this;
     requestUpdate(): this;
-    update(): Promise<void>;
-    render(options: TextRenderOptions): Promise<void>;
+    update(): this;
+    render(options: TextRenderOptions): void;
 }
 
 type Sizeable = `${number}%` | `${number}rem` | number;
@@ -286,15 +292,15 @@ interface ParagraphContent extends Partial<TextStyle> {
     fragments: FragmentContent[];
 }
 type TextContent = string | FragmentContent | ParagraphContent | (string | FragmentContent | ParagraphContent | (string | FragmentContent)[])[];
-type PromiseLike<T> = T | Promise<T>;
 interface TextPlugin {
     name: string;
     paths?: Path2D[];
-    getBoundingBox?: (text: Text) => BoundingBox | undefined;
+    getBoundingBox?: (text: Text$1) => BoundingBox | undefined;
+    update?: (text: Text$1) => void;
     updateOrder?: number;
-    update?: (text: Text) => PromiseLike<void>;
+    render?: (ctx: CanvasRenderingContext2D, text: Text$1) => void;
     renderOrder?: number;
-    render?: (ctx: CanvasRenderingContext2D, text: Text) => PromiseLike<void>;
+    load?: (text: Text$1) => Promise<void>;
 }
 interface TextOptions {
     debug?: boolean;
@@ -328,23 +334,23 @@ declare function drawPath(options: DrawShapePathsOptions): void;
 
 declare function setupView(ctx: CanvasRenderingContext2D, pixelRatio: number, boundingBox: BoundingBox): void;
 
-declare function uploadColors(ctx: CanvasRenderingContext2D, text: Text): void;
+declare function uploadColors(ctx: CanvasRenderingContext2D, text: Text$1): void;
 
 declare function definePlugin(options: TextPlugin): TextPlugin;
 
 declare function measureText(options: TextOptions): Promise<MeasureResult>;
 
+declare function renderText(options: TextOptions & TextRenderOptions): Promise<void>;
+
 declare function highlight(): TextPlugin;
 
 declare function listStyle(): TextPlugin;
 
 declare function render(): TextPlugin;
-declare function getTransform2D(text: Text, style: Partial<TextStyle>): Matrix3;
+declare function getTransform2D(text: Text$1, style: Partial<TextStyle>): Matrix3;
 
 declare function textDecoration(): TextPlugin;
 
-declare function renderText(options: TextOptions & TextRenderOptions): Promise<void>;
-
 interface ValueContext {
     total: number;
     fontSize: number;
@@ -356,5 +362,6 @@ declare function isEqualObject(obj1: Record<string, any>, obj2: Record<string, a
 declare function isEqualValue(val1: any, val2: any): boolean;
 declare function hexToRgb(hex: string): string | null;
 declare function filterEmpty(val: Record<string, any> | undefined): Record<string, any> | undefined;
+declare function needsFetch(source: string): boolean;
 
-export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type Sizeable, Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };
+export { Character, type DrawShapePathsOptions, type FontKerning, type FontStyle, type FontWeight, Fragment, type FragmentContent, type HighlightColormap, type HighlightImage, type HighlightLine, type HighlightReferImage, type HighlightSize, type HighlightThickness, type LinearGradient, type ListStyleColormap, type ListStyleImage, type ListStylePosition, type ListStyleSize, type ListStyleType, type MeasureDomResult, type MeasureResult, type MeasuredCharacter, type MeasuredFragment, type MeasuredParagraph, Measurer, Paragraph, type ParagraphContent, type Sizeable, Text$1 as Text, type TextAlign, type TextContent, type TextDecorationLine, type TextDrawStyle, type TextEventMap, type TextInlineStyle, type TextLineStyle, type TextOptions, type TextOrientation, type TextPlugin, type TextRenderOptions, type TextStyle, type TextTransform, type TextWrap, type VerticalAlign, type WritingMode, defaultTextStyles, definePlugin, drawPath, filterEmpty, getTransform2D, hexToRgb, highlight, isEqualObject, isEqualValue, isNone, listStyle, measureText, needsFetch, parseColor, parseColormap, parseValueNumber, render, renderText, setupView, textDecoration, uploadColor, uploadColors };