Merge pull request #2117 from Shopify/rename-enum2

Rename Paragraph Enums for better consistency

Author: wcandillon

package/src/renderer/__tests__/e2e/Paragraphs.spec.tsx

@@ -7,8 +7,8 @@ import {
 } from "../../../__tests__/setup";
 import {
   FontStyle,
-  SkTextAlign,
-  SkTextDirection,
+  TextAlign,
+  TextDirection,
   TextDecoration,
 } from "../../../skia/types";
 
@@ -216,7 +216,7 @@ describe("Paragraphs", () => {
         para.layout(width);
         para.paint(canvas, 0, 0);
       },
-      { width: surface.width, textAlign: SkTextAlign.Right }
+      { width: surface.width, textAlign: TextAlign.Right }
     );
     checkImage(
       img,
@@ -236,7 +236,7 @@ describe("Paragraphs", () => {
         para.layout(width);
         para.paint(canvas, 0, 0);
       },
-      { width: surface.width, textAlign: SkTextAlign.Center }
+      { width: surface.width, textAlign: TextAlign.Center }
     );
     checkImage(
       img,
@@ -260,7 +260,7 @@ describe("Paragraphs", () => {
         para.layout(width);
         para.paint(canvas, 0, 0);
       },
-      { textAlign: SkTextAlign.Justify, width: surface.width }
+      { textAlign: TextAlign.Justify, width: surface.width }
     );
     checkImage(
       img,
@@ -284,7 +284,7 @@ describe("Paragraphs", () => {
         para.layout(width);
         para.paint(canvas, 0, 0);
       },
-      { width: surface.width, textAlign: SkTextAlign.Justify }
+      { width: surface.width, textAlign: TextAlign.Justify }
     );
     checkImage(
       img,
@@ -306,7 +306,7 @@ describe("Paragraphs", () => {
         para.layout(150);
         para.paint(canvas, 0, 0);
       },
-      { textDirection: SkTextDirection.RTL }
+      { textDirection: TextDirection.RTL }
     );
     checkImage(
       img,

package/src/skia/types/Paragraph/Paragraph.ts

@@ -2,11 +2,11 @@ import type { SkCanvas } from "../Canvas";
 import type { SkJSIInstance } from "../JsiInstance";
 import type { SkRect } from "../Rect";
 
-import type { SkTextDirection } from "./ParagraphStyle";
+import type { TextDirection } from "./ParagraphStyle";
 
 export interface SkRectWithDirection {
   rect: SkRect;
-  direction: SkTextDirection;
+  direction: TextDirection;
 }
 
 export interface SkParagraph extends SkJSIInstance<"Paragraph"> {

package/src/skia/types/Paragraph/ParagraphStyle.ts

@@ -1,10 +1,10 @@
 import type { SkTextFontStyle, SkTextStyle } from "./TextStyle";
 
-export enum SkTextDirection {
+export enum TextDirection {
   RTL = 0,
   LTR = 1,
 }
-export enum SkTextAlign {
+export enum TextAlign {
   Left = 0,
   Right,
   Center,
@@ -24,7 +24,7 @@ export interface SkStrutStyle {
   forceStrutHeight?: boolean;
 }
 
-export enum SkTextHeightBehavior {
+export enum TextHeightBehavior {
   All = 0x0,
   DisableFirstAscent = 0x1,
   DisableLastDescent = 0x2,
@@ -38,8 +38,8 @@ export interface SkParagraphStyle {
   maxLines?: number;
   replaceTabCharacters?: boolean;
   strutStyle?: SkStrutStyle;
-  textAlign?: SkTextAlign;
-  textDirection?: SkTextDirection;
-  textHeightBehavior?: SkTextHeightBehavior;
+  textAlign?: TextAlign;
+  textDirection?: TextDirection;
+  textHeightBehavior?: TextHeightBehavior;
   textStyle?: SkTextStyle;
 }

package/src/skia/web/JsiSkParagraphStyle.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit, ParagraphStyle } from "canvaskit-wasm";
 
-import { SkTextDirection, type SkParagraphStyle } from "../types";
+import { TextDirection, type SkParagraphStyle } from "../types";
 
 export class JsiSkParagraphStyle {
   static toParagraphStyle(
@@ -23,7 +23,7 @@ export class JsiSkParagraphStyle {
         : undefined ?? ps.textAlign;
     ps.textDirection =
       value.textDirection !== undefined
-        ? { value: value.textDirection === SkTextDirection.LTR ? 1 : 0 }
+        ? { value: value.textDirection === TextDirection.LTR ? 1 : 0 }
         : ps.textDirection;
     ps.textHeightBehavior =
       value.textHeightBehavior !== undefined