react-native-enriched-markdown 0.4.0 → 0.4.1

package/ios/internals/EnrichedMarkdownShadowNode.mm

@@ -63,7 +63,13 @@ Size EnrichedMarkdownShadowNode::measureContent(const LayoutContext &layoutConte
     auto cacheKey = buildMeasurementCacheKey(typedProps, maxWidth, fontScale, MarkdownFlavor::GitHub);
     CachedSize cached;
     if (MeasurementCache::shared().get(cacheKey, cached)) {
-      return {cached.width, std::min(cached.height, (CGFloat)maxHeight)};
+      Float cachedWidth = std::max(cached.width, layoutConstraints.minimumSize.width);
+      cachedWidth = std::min(cachedWidth, layoutConstraints.maximumSize.width);
+      Float cachedHeight = std::max(cached.height, layoutConstraints.minimumSize.height);
+      if (std::isfinite(layoutConstraints.maximumSize.height)) {
+        cachedHeight = std::min(cachedHeight, layoutConstraints.maximumSize.height);
+      }
+      return {cachedWidth, cachedHeight};
     }
   }
 
@@ -95,7 +101,15 @@ Size EnrichedMarkdownShadowNode::measureContent(const LayoutContext &layoutConte
     MeasurementCache::shared().set(cacheKey, {size.width, size.height});
   }
 
-  return {size.width, MIN(size.height, maxHeight)};
+  Float clampedWidth = size.width;
+  Float clampedHeight = size.height;
+  clampedWidth = std::max(clampedWidth, layoutConstraints.minimumSize.width);
+  clampedWidth = std::min(clampedWidth, layoutConstraints.maximumSize.width);
+  clampedHeight = std::max(clampedHeight, layoutConstraints.minimumSize.height);
+  if (std::isfinite(layoutConstraints.maximumSize.height)) {
+    clampedHeight = std::min(clampedHeight, layoutConstraints.maximumSize.height);
+  }
+  return {clampedWidth, clampedHeight};
 }
 
 } // namespace facebook::react

package/ios/internals/EnrichedMarkdownTextShadowNode.mm

@@ -66,7 +66,13 @@ Size EnrichedMarkdownTextShadowNode::measureContent(const LayoutContext &layoutC
     auto cacheKey = buildMeasurementCacheKey(typedProps, maxWidth, fontScale, MarkdownFlavor::CommonMark);
     CachedSize cached;
     if (MeasurementCache::shared().get(cacheKey, cached)) {
-      return {cached.width, std::min(cached.height, (CGFloat)maxHeight)};
+      Float cachedWidth = std::max(cached.width, layoutConstraints.minimumSize.width);
+      cachedWidth = std::min(cachedWidth, layoutConstraints.maximumSize.width);
+      Float cachedHeight = std::max(cached.height, layoutConstraints.minimumSize.height);
+      if (std::isfinite(layoutConstraints.maximumSize.height)) {
+        cachedHeight = std::min(cachedHeight, layoutConstraints.maximumSize.height);
+      }
+      return {cachedWidth, cachedHeight};
     }
   }
 
@@ -98,7 +104,15 @@ Size EnrichedMarkdownTextShadowNode::measureContent(const LayoutContext &layoutC
     MeasurementCache::shared().set(cacheKey, {size.width, size.height});
   }
 
-  return {size.width, MIN(size.height, maxHeight)};
+  Float clampedWidth = size.width;
+  Float clampedHeight = size.height;
+  clampedWidth = std::max(clampedWidth, layoutConstraints.minimumSize.width);
+  clampedWidth = std::min(clampedWidth, layoutConstraints.maximumSize.width);
+  clampedHeight = std::max(clampedHeight, layoutConstraints.minimumSize.height);
+  if (std::isfinite(layoutConstraints.maximumSize.height)) {
+    clampedHeight = std::min(clampedHeight, layoutConstraints.maximumSize.height);
+  }
+  return {clampedWidth, clampedHeight};
 }
 
 } // namespace facebook::react

package/ios/utils/StylePropsUtils.h

@@ -497,9 +497,12 @@ BOOL applyMarkdownStyleToConfig(StyleConfig *config, const MarkdownStyle &newSty
     changed = YES;
   }
 
-  if (newStyle.link.underline != oldStyle.link.underline) {
-    [config setLinkUnderline:newStyle.link.underline];
-    changed = YES;
+  {
+    BOOL newUnderline = newStyle.link.underline ? YES : NO;
+    if (newStyle.link.underline != oldStyle.link.underline || [config linkUnderline] != newUnderline) {
+      [config setLinkUnderline:newUnderline];
+      changed = YES;
+    }
   }
 
   // ── Strong ─────────────────────────────────────────────────────────────────

package/lib/module/plugin/withAndroidMath.js

@@ -0,0 +1,23 @@
+"use strict";
+
+import configPlugins from '@expo/config-plugins';
+const {
+  withGradleProperties
+} = configPlugins;
+export const withAndroidMath = (config, {
+  enableMath = true
+}) => {
+  if (enableMath) {
+    return config;
+  }
+  return withGradleProperties(config, gradleConfig => {
+    gradleConfig.modResults = gradleConfig.modResults.filter(prop => prop.type !== 'property' || prop.key !== 'enrichedMarkdown.enableMath');
+    gradleConfig.modResults.push({
+      type: 'property',
+      key: 'enrichedMarkdown.enableMath',
+      value: 'false'
+    });
+    return gradleConfig;
+  });
+};
+//# sourceMappingURL=withAndroidMath.js.map

package/lib/module/plugin/withAndroidMath.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["configPlugins","withGradleProperties","withAndroidMath","config","enableMath","gradleConfig","modResults","filter","prop","type","key","push","value"],"sourceRoot":"../../../src","sources":["plugin/withAndroidMath.ts"],"mappings":";;AAAA,OAAOA,aAAa,MAA6B,sBAAsB;AAEvE,MAAM;EAAEC;AAAqB,CAAC,GAAGD,aAAa;AAE9C,OAAO,MAAME,eAAuD,GAAGA,CACrEC,MAAM,EACN;EAAEC,UAAU,GAAG;AAAK,CAAC,KAClB;EACH,IAAIA,UAAU,EAAE;IACd,OAAOD,MAAM;EACf;EACA,OAAOF,oBAAoB,CAACE,MAAM,EAAGE,YAAY,IAAK;IACpDA,YAAY,CAACC,UAAU,GAAGD,YAAY,CAACC,UAAU,CAACC,MAAM,CACrDC,IAAI,IACHA,IAAI,CAACC,IAAI,KAAK,UAAU,IAAID,IAAI,CAACE,GAAG,KAAK,6BAC7C,CAAC;IAEDL,YAAY,CAACC,UAAU,CAACK,IAAI,CAAC;MAC3BF,IAAI,EAAE,UAAU;MAChBC,GAAG,EAAE,6BAA6B;MAClCE,KAAK,EAAE;IACT,CAAC,CAAC;IAEF,OAAOP,YAAY;EACrB,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/plugin/withIosMath.js

@@ -0,0 +1,26 @@
+"use strict";
+
+import configPlugins from '@expo/config-plugins';
+import fs from 'fs';
+import path from 'path';
+const {
+  withDangerousMod
+} = configPlugins;
+const IOS_MATH_OPTION = "ENV['ENRICHED_MARKDOWN_ENABLE_MATH'] = '0'";
+export const withIosMath = (config, {
+  enableMath = true
+}) => {
+  if (enableMath) {
+    return config;
+  }
+  return withDangerousMod(config, ['ios', async modConfig => {
+    const file = path.join(modConfig.modRequest.platformProjectRoot, 'Podfile');
+    const contents = fs.readFileSync(file, 'utf8');
+    const lines = contents.split('\n');
+    const filteredLines = lines.filter(line => !line.includes('ENRICHED_MARKDOWN_ENABLE_MATH'));
+    filteredLines.unshift(IOS_MATH_OPTION);
+    fs.writeFileSync(file, filteredLines.join('\n'));
+    return modConfig;
+  }]);
+};
+//# sourceMappingURL=withIosMath.js.map

package/lib/module/plugin/withIosMath.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["configPlugins","fs","path","withDangerousMod","IOS_MATH_OPTION","withIosMath","config","enableMath","modConfig","file","join","modRequest","platformProjectRoot","contents","readFileSync","lines","split","filteredLines","filter","line","includes","unshift","writeFileSync"],"sourceRoot":"../../../src","sources":["plugin/withIosMath.ts"],"mappings":";;AAAA,OAAOA,aAAa,MAA6B,sBAAsB;AACvE,OAAOC,EAAE,MAAM,IAAI;AACnB,OAAOC,IAAI,MAAM,MAAM;AAEvB,MAAM;EAAEC;AAAiB,CAAC,GAAGH,aAAa;AAE1C,MAAMI,eAAe,GAAG,4CAA4C;AAEpE,OAAO,MAAMC,WAAmD,GAAGA,CACjEC,MAAM,EACN;EAAEC,UAAU,GAAG;AAAK,CAAC,KAClB;EACH,IAAIA,UAAU,EAAE;IACd,OAAOD,MAAM;EACf;EACA,OAAOH,gBAAgB,CAACG,MAAM,EAAE,CAC9B,KAAK,EACL,MAAOE,SAAS,IAAK;IACnB,MAAMC,IAAI,GAAGP,IAAI,CAACQ,IAAI,CACpBF,SAAS,CAACG,UAAU,CAACC,mBAAmB,EACxC,SACF,CAAC;IACD,MAAMC,QAAQ,GAAGZ,EAAE,CAACa,YAAY,CAACL,IAAI,EAAE,MAAM,CAAC;IAE9C,MAAMM,KAAK,GAAGF,QAAQ,CAACG,KAAK,CAAC,IAAI,CAAC;IAClC,MAAMC,aAAa,GAAGF,KAAK,CAACG,MAAM,CAC/BC,IAAI,IAAK,CAACA,IAAI,CAACC,QAAQ,CAAC,+BAA+B,CAC1D,CAAC;IAEDH,aAAa,CAACI,OAAO,CAACjB,eAAe,CAAC;IAEtCH,EAAE,CAACqB,aAAa,CAACb,IAAI,EAAEQ,aAAa,CAACP,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhD,OAAOF,SAAS;EAClB,CAAC,CACF,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/plugin/withReactNativeEnrichedMarkdown.js

@@ -0,0 +1,16 @@
+"use strict";
+
+import { withIosMath } from "./withIosMath.js";
+import { withAndroidMath } from "./withAndroidMath.js";
+const withEnrichedMarkdown = (config, props) => {
+  const enableMath = props?.enableMath !== false;
+  config = withAndroidMath(config, {
+    enableMath
+  });
+  config = withIosMath(config, {
+    enableMath
+  });
+  return config;
+};
+export default withEnrichedMarkdown;
+//# sourceMappingURL=withReactNativeEnrichedMarkdown.js.map

package/lib/module/plugin/withReactNativeEnrichedMarkdown.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["withIosMath","withAndroidMath","withEnrichedMarkdown","config","props","enableMath"],"sourceRoot":"../../../src","sources":["plugin/withReactNativeEnrichedMarkdown.ts"],"mappings":";;AACA,SAASA,WAAW,QAAQ,kBAAe;AAC3C,SAASC,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,oBAAmE,GAAGA,CAC1EC,MAAM,EACNC,KAAK,KACF;EACH,MAAMC,UAAU,GAAGD,KAAK,EAAEC,UAAU,KAAK,KAAK;EAE9CF,MAAM,GAAGF,eAAe,CAACE,MAAM,EAAE;IAAEE;EAAW,CAAC,CAAC;EAChDF,MAAM,GAAGH,WAAW,CAACG,MAAM,EAAE;IAAEE;EAAW,CAAC,CAAC;EAE5C,OAAOF,MAAM;AACf,CAAC;AAED,eAAeD,oBAAoB","ignoreList":[]}

package/lib/typescript/src/plugin/withAndroidMath.d.ts

@@ -0,0 +1,5 @@
+import { type ConfigPlugin } from '@expo/config-plugins';
+export declare const withAndroidMath: ConfigPlugin<{
+    enableMath?: boolean;
+}>;
+//# sourceMappingURL=withAndroidMath.d.ts.map

package/lib/typescript/src/plugin/withAndroidMath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withAndroidMath.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withAndroidMath.ts"],"names":[],"mappings":"AAAA,OAAsB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIxE,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,CAqBlE,CAAC"}

package/lib/typescript/src/plugin/withIosMath.d.ts

@@ -0,0 +1,5 @@
+import { type ConfigPlugin } from '@expo/config-plugins';
+export declare const withIosMath: ConfigPlugin<{
+    enableMath?: boolean;
+}>;
+//# sourceMappingURL=withIosMath.d.ts.map

package/lib/typescript/src/plugin/withIosMath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withIosMath.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withIosMath.ts"],"names":[],"mappings":"AAAA,OAAsB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQxE,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,CA4B9D,CAAC"}

package/lib/typescript/src/plugin/withReactNativeEnrichedMarkdown.d.ts

@@ -0,0 +1,6 @@
+import { type ConfigPlugin } from '@expo/config-plugins';
+declare const withEnrichedMarkdown: ConfigPlugin<{
+    enableMath?: boolean;
+} | void>;
+export default withEnrichedMarkdown;
+//# sourceMappingURL=withReactNativeEnrichedMarkdown.d.ts.map

package/lib/typescript/src/plugin/withReactNativeEnrichedMarkdown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withReactNativeEnrichedMarkdown.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withReactNativeEnrichedMarkdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD,QAAA,MAAM,oBAAoB,EAAE,YAAY,CAAC;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAUvE,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-enriched-markdown",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Markdown Text component for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -10,7 +10,8 @@
       "types": "./lib/typescript/src/index.d.ts",
       "default": "./lib/module/index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./app.plugin.js": "./app.plugin.js"
   },
   "files": [
     "src",
@@ -29,7 +30,8 @@
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__",
-    "!**/.*"
+    "!**/.*",
+    "app.plugin.js"
   ],
   "scripts": {
     "example": "yarn workspace react-native-enriched-markdown-example",
@@ -74,13 +76,13 @@
     "@eslint/compat": "^1.3.2",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.35.0",
-    "@evilmartians/lefthook": "^1.12.3",
+    "@expo/config-plugins": "^55.0.6",
     "@react-native-community/cli": "20.0.1",
-    "@react-native/babel-preset": "0.81.1",
-    "@react-native/eslint-config": "^0.81.1",
+    "@react-native/babel-preset": "0.84.1",
+    "@react-native/eslint-config": "0.84.1",
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/jest": "^29.5.14",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.2.0",
     "clang-format": "^1.8.0",
     "commitlint": "^19.8.1",
     "del-cli": "^6.0.0",
@@ -88,22 +90,29 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "jest": "^29.7.0",
+    "lefthook": "^2.0.3",
     "prettier": "^3.6.2",
-    "react": "19.1.0",
-    "react-native": "0.81.1",
-    "react-native-builder-bob": "^0.40.13",
+    "react": "19.2.3",
+    "react-native": "0.84.1",
+    "react-native-builder-bob": "^0.40.18",
     "release-it": "^19.0.4",
     "turbo": "^2.5.6",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
+    "@expo/config-plugins": ">=50.0.0",
     "react": "*",
     "react-native": "*"
   },
+  "peerDependenciesMeta": {
+    "@expo/config-plugins": {
+      "optional": true
+    }
+  },
   "workspaces": [
     "example"
   ],
-  "packageManager": "yarn@3.6.1",
+  "packageManager": "yarn@4.11.0",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [
@@ -185,8 +194,14 @@
     "includesGeneratedCode": true
   },
   "create-react-native-library": {
-    "languages": "kotlin-objc",
     "type": "fabric-view",
-    "version": "0.54.6"
+    "languages": "kotlin-objc",
+    "tools": [
+      "eslint",
+      "jest",
+      "lefthook",
+      "release-it"
+    ],
+    "version": "0.57.2"
   }
 }

package/src/plugin/withAndroidMath.ts

@@ -0,0 +1,26 @@
+import configPlugins, { type ConfigPlugin } from '@expo/config-plugins';
+
+const { withGradleProperties } = configPlugins;
+
+export const withAndroidMath: ConfigPlugin<{ enableMath?: boolean }> = (
+  config,
+  { enableMath = true }
+) => {
+  if (enableMath) {
+    return config;
+  }
+  return withGradleProperties(config, (gradleConfig) => {
+    gradleConfig.modResults = gradleConfig.modResults.filter(
+      (prop) =>
+        prop.type !== 'property' || prop.key !== 'enrichedMarkdown.enableMath'
+    );
+
+    gradleConfig.modResults.push({
+      type: 'property',
+      key: 'enrichedMarkdown.enableMath',
+      value: 'false',
+    });
+
+    return gradleConfig;
+  });
+};

package/src/plugin/withIosMath.ts

@@ -0,0 +1,37 @@
+import configPlugins, { type ConfigPlugin } from '@expo/config-plugins';
+import fs from 'fs';
+import path from 'path';
+
+const { withDangerousMod } = configPlugins;
+
+const IOS_MATH_OPTION = "ENV['ENRICHED_MARKDOWN_ENABLE_MATH'] = '0'";
+
+export const withIosMath: ConfigPlugin<{ enableMath?: boolean }> = (
+  config,
+  { enableMath = true }
+) => {
+  if (enableMath) {
+    return config;
+  }
+  return withDangerousMod(config, [
+    'ios',
+    async (modConfig) => {
+      const file = path.join(
+        modConfig.modRequest.platformProjectRoot,
+        'Podfile'
+      );
+      const contents = fs.readFileSync(file, 'utf8');
+
+      const lines = contents.split('\n');
+      const filteredLines = lines.filter(
+        (line) => !line.includes('ENRICHED_MARKDOWN_ENABLE_MATH')
+      );
+
+      filteredLines.unshift(IOS_MATH_OPTION);
+
+      fs.writeFileSync(file, filteredLines.join('\n'));
+
+      return modConfig;
+    },
+  ]);
+};

package/src/plugin/withReactNativeEnrichedMarkdown.ts

@@ -0,0 +1,17 @@
+import { type ConfigPlugin } from '@expo/config-plugins';
+import { withIosMath } from './withIosMath';
+import { withAndroidMath } from './withAndroidMath';
+
+const withEnrichedMarkdown: ConfigPlugin<{ enableMath?: boolean } | void> = (
+  config,
+  props
+) => {
+  const enableMath = props?.enableMath !== false;
+
+  config = withAndroidMath(config, { enableMath });
+  config = withIosMath(config, { enableMath });
+
+  return config;
+};
+
+export default withEnrichedMarkdown;