@expensify/react-native-live-markdown 0.1.315 → 0.1.317

package/src/MarkdownTextInput.tsx

@@ -1,19 +1,20 @@
 import {StyleSheet, TextInput, processColor} from 'react-native';
 import React from 'react';
 import type {TextInputProps} from 'react-native';
-import {createWorkletRuntime, makeShareableCloneRecursive} from 'react-native-reanimated';
+import {createSerializable, createWorkletRuntime} from 'react-native-worklets';
+import type {SerializableRef, WorkletFunction, WorkletRuntime} from 'react-native-worklets';
 import MarkdownTextInputDecoratorViewNativeComponent from './MarkdownTextInputDecoratorViewNativeComponent';
 import type {MarkdownStyle} from './MarkdownTextInputDecoratorViewNativeComponent';
 import NativeLiveMarkdownModule from './NativeLiveMarkdownModule';
 import {mergeMarkdownStyleWithDefault} from './styleUtils';
 import type {PartialMarkdownStyle} from './styleUtils';
-import type {InlineImagesInputProps, MarkdownRange, ShareableRef, WorkletFunction, WorkletRuntime} from './commonTypes';
+import type {InlineImagesInputProps, MarkdownRange} from './commonTypes';
 
 declare global {
   // eslint-disable-next-line no-var
   var jsi_setMarkdownRuntime: (runtime: WorkletRuntime) => void;
   // eslint-disable-next-line no-var
-  var jsi_registerMarkdownWorklet: (shareableWorklet: ShareableRef<WorkletFunction<[string], MarkdownRange[]>>) => number;
+  var jsi_registerMarkdownWorklet: (shareableWorklet: SerializableRef<WorkletFunction<[string], MarkdownRange[]>>) => number;
   // eslint-disable-next-line no-var
   var jsi_unregisterMarkdownWorklet: (parserId: number) => void;
 }
@@ -40,15 +41,15 @@ function initializeLiveMarkdownIfNeeded() {
   if (!global.jsi_setMarkdownRuntime) {
     throw new Error('[react-native-live-markdown] global.jsi_setMarkdownRuntime is not available');
   }
-  workletRuntime = createWorkletRuntime('LiveMarkdownRuntime');
+  workletRuntime = createWorkletRuntime({name: 'LiveMarkdownRuntime'});
   global.jsi_setMarkdownRuntime(workletRuntime);
   initialized = true;
 }
 
 function registerParser(parser: (input: string) => MarkdownRange[]): number {
   initializeLiveMarkdownIfNeeded();
-  const shareableWorklet = makeShareableCloneRecursive(parser) as unknown as ShareableRef<WorkletFunction<[string], MarkdownRange[]>>;
-  const parserId = global.jsi_registerMarkdownWorklet(shareableWorklet);
+  const serializableWorklet = createSerializable(parser as WorkletFunction<[string], MarkdownRange[]>);
+  const parserId = global.jsi_registerMarkdownWorklet(serializableWorklet);
   return parserId;
 }
 

package/src/commonTypes.ts

@@ -29,78 +29,4 @@ type InlineImagesInputProps = {
   imagePreviewAuthRequiredURLs?: string[];
 };
 
-// Temporary types from `react-native-reanimated` and `react-native-worklets`
-// TODO: remove once `react-native-reanimated` dependency is removed
-
-type WorkletStackDetails = [error: Error, lineOffset: number, columnOffset: number];
-
-type WorkletClosure = Record<string, unknown>;
-
-interface WorkletInitData {
-  code: string;
-  /** Only in dev builds. */
-  location?: string;
-  /** Only in dev builds. */
-  sourceMap?: string;
-}
-
-interface WorkletProps {
-  __closure: WorkletClosure;
-  __workletHash: number;
-  /** Only in Legacy Bundling. */
-  __initData?: WorkletInitData;
-  /** Only for Handles. */
-  __init?: () => unknown;
-  /** `__stackDetails` is removed after parsing. */
-  __stackDetails?: WorkletStackDetails;
-  /** Only in dev builds. */
-  __pluginVersion?: string;
-}
-
-type WorkletFunctionWorklets<TArgs extends unknown[] = unknown[], TReturn = unknown> = ((...args: TArgs) => TReturn) & WorkletProps;
-
-interface WorkletInitDataCommon {
-  code: string;
-}
-
-type WorkletInitDataRelease = WorkletInitDataCommon;
-
-interface WorkletInitDataDev extends WorkletInitDataCommon {
-  location: string;
-  sourceMap: string;
-  version: string;
-}
-
-interface WorkletBaseCommon {
-  __closure: WorkletClosure;
-  __workletHash: number;
-}
-
-interface WorkletBaseRelease extends WorkletBaseCommon {
-  __initData: WorkletInitDataRelease;
-}
-
-interface WorkletBaseDev extends WorkletBaseCommon {
-  __initData: WorkletInitDataDev;
-  /** `__stackDetails` is removed after parsing. */
-  __stackDetails?: WorkletStackDetails;
-}
-
-type WorkletFunctionDev<Args extends unknown[] = unknown[], ReturnValue = unknown> = ((...args: Args) => ReturnValue) & WorkletBaseDev;
-
-type WorkletFunctionRelease<Args extends unknown[] = unknown[], ReturnValue = unknown> = ((...args: Args) => ReturnValue) & WorkletBaseRelease;
-
-type WorkletFunctionReanimated<Args extends unknown[] = unknown[], ReturnValue = unknown> = WorkletFunctionDev<Args, ReturnValue> | WorkletFunctionRelease<Args, ReturnValue>;
-
-type WorkletFunction<T extends unknown[], U> = WorkletFunctionWorklets<T, U> | WorkletFunctionReanimated<T, U>;
-
-type ShareableRef<T = unknown> = {
-  __hostObjectShareableJSRef: T;
-};
-
-type WorkletRuntime = {
-  __hostObjectWorkletRuntime: never;
-  readonly name: string;
-};
-
-export type {MarkdownType, MarkdownRange, InlineImagesInputProps, WorkletFunction, ShareableRef, WorkletRuntime};
+export type {MarkdownType, MarkdownRange, InlineImagesInputProps};

package/src/parseExpensiMark.ts

@@ -4,8 +4,9 @@ import {Platform} from 'react-native';
 import {ExpensiMark} from 'expensify-common';
 import {unescapeText} from 'expensify-common/dist/utils';
 import {decode} from 'html-entities';
-import type {MarkdownType, MarkdownRange, WorkletFunction} from './commonTypes';
+import type {WorkletFunction} from 'react-native-worklets';
 import {groupRanges, sortRanges, excludeRangeTypesFromFormatting, getRangesToExcludeFormatting} from './rangeUtils';
+import type {MarkdownRange, MarkdownType} from './commonTypes';
 
 function isWeb() {
   return Platform.OS === 'web';

package/src/styleUtils.ts

@@ -62,14 +62,17 @@ function makeDefaultMarkdownStyle(): MarkdownStyle {
     mentionHere: {
       color: 'green',
       backgroundColor: 'lime',
+      borderRadius: 5,
     },
     mentionUser: {
       color: 'blue',
       backgroundColor: 'cyan',
+      borderRadius: 5,
     },
     mentionReport: {
       color: 'red',
       backgroundColor: 'pink',
+      borderRadius: 5,
     },
     inlineImage: {
       minWidth: 50,

package/apple/BlockquoteTextLayoutFragment.mm

@@ -1,51 +0,0 @@
-#import <RNLiveMarkdown/BlockquoteTextLayoutFragment.h>
-
-@implementation BlockquoteTextLayoutFragment
-
-- (CGRect)boundingRect {
-  CGRect fragmentTextBounds = CGRectNull;
-  for (NSTextLineFragment *lineFragment in self.textLineFragments) {
-    if (lineFragment.characterRange.length == 0) {
-      continue;
-    }
-    CGRect lineFragmentBounds = lineFragment.typographicBounds;
-    if (CGRectIsNull(fragmentTextBounds)) {
-      fragmentTextBounds = lineFragmentBounds;
-    } else {
-      fragmentTextBounds = CGRectUnion(fragmentTextBounds, lineFragmentBounds);
-    }
-  }
-  
-  CGFloat marginLeft = _markdownUtils.markdownStyle.blockquoteMarginLeft;
-  CGFloat borderWidth = _markdownUtils.markdownStyle.blockquoteBorderWidth;
-  CGFloat paddingLeft = _markdownUtils.markdownStyle.blockquotePaddingLeft;
-  CGFloat shift = marginLeft + borderWidth + paddingLeft;
-
-  fragmentTextBounds.origin.x -= (paddingLeft + borderWidth) + shift * (_depth - 1);
-  fragmentTextBounds.size.width = borderWidth + shift * (_depth - 1);
-
-  return fragmentTextBounds;
-}
-
-- (void)drawAtPoint:(CGPoint)point inContext:(CGContextRef)ctx {
-  CGFloat marginLeft = _markdownUtils.markdownStyle.blockquoteMarginLeft;
-  CGFloat borderWidth = _markdownUtils.markdownStyle.blockquoteBorderWidth;
-  CGFloat paddingLeft = _markdownUtils.markdownStyle.blockquotePaddingLeft;
-  CGFloat shift = marginLeft + borderWidth + paddingLeft;
-
-  [_markdownUtils.markdownStyle.blockquoteBorderColor setFill];
-
-  CGRect boundingRect = self.boundingRect;
-  for (NSUInteger i = 0; i < _depth; ++i) {
-    CGRect ribbonRect = CGRectMake(boundingRect.origin.x + i * shift, boundingRect.origin.y, borderWidth, boundingRect.size.height);
-    UIRectFill(ribbonRect);
-  }
-
-  [super drawAtPoint:point inContext:ctx];
-}
-
-- (CGRect)renderingSurfaceBounds {
-  return CGRectUnion(self.boundingRect, [super renderingSurfaceBounds]);
-}
-
-@end