@tinglinzh/react-native-markdownview 0.3.0 → 0.5.0

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./plugin/index.js');

package/ios/RNMarkdownViewManager.m

@@ -1,13 +1,33 @@
 /**
- * Old Architecture bridge.
+ * Old Architecture view manager — pure Objective-C implementation.
  *
- * React Native uses KVC to set these properties on the UIView returned by
- * RNMarkdownViewManager.view(). The property names must match exactly what
- * RNMarkdownView exposes via @objc.
+ * Framework targets don't support bridging headers, so we:
+ *   1. Keep this file as ObjC (no bridging header needed).
+ *   2. Import the auto-generated Swift header to access RNMarkdownView.
+ *   3. Delete the separate RNMarkdownViewManager.swift file.
+ *
+ * The Swift-generated header is emitted by the compiler as
+ * "react_native_markdownview-Swift.h" (pod name, hyphens → underscores).
  */
 #import <React/RCTViewManager.h>
+#import "react_native_markdownview-Swift.h"
+
+@interface RNMarkdownViewManager : RCTViewManager
+@end
+
+@implementation RNMarkdownViewManager
+
+RCT_EXPORT_MODULE()
+
+- (UIView *)view
+{
+    return [[RNMarkdownView alloc] init];
+}
 
-@interface RCT_EXTERN_MODULE(RNMarkdownViewManager, RCTViewManager)
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
 
 // ─── Content ────────────────────────────────────────────────────────────────
 /// Raw markdown string.
@@ -24,11 +44,11 @@ RCT_EXPORT_VIEW_PROPERTY(onLinkPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onImagePress, RCTDirectEventBlock)
 
 /// Fires when lines are selected in a code block.
-/// Payload: { startLine: number, endLine: number, contents: string[], language?: string }
+/// Payload: { startLine: number, endLine: number, contents: string, language: string }
 RCT_EXPORT_VIEW_PROPERTY(onLineSelection, RCTDirectEventBlock)
 
 /// Fires when the intrinsic content height changes.
-/// Payload: { contentSize: { width: number, height: number } }
+/// Payload: { width: number, height: number }
 RCT_EXPORT_VIEW_PROPERTY(onContentSizeChange, RCTDirectEventBlock)
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinglinzh/react-native-markdownview",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "React Native wrapper for MarkdownView — native iOS/macOS markdown rendering with GFM, syntax highlighting, LaTeX math, and unified diff support",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -14,10 +14,13 @@
       "types": "./lib/typescript/src/index.d.ts"
     }
   },
+  "plugin": "app.plugin.js",
   "files": [
     "src",
     "lib",
     "ios",
+    "plugin",
+    "app.plugin.js",
     "react-native-markdownview.podspec",
     "Package.swift"
   ],
@@ -37,9 +40,15 @@
   "author": "",
   "license": "MIT",
   "peerDependencies": {
+    "@expo/config-plugins": ">=7.0.0",
     "react": "*",
     "react-native": "*"
   },
+  "peerDependenciesMeta": {
+    "@expo/config-plugins": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@types/react": "^18.3.28",
     "react": "18.3.1",

package/plugin/index.js

@@ -0,0 +1,139 @@
+'use strict';
+
+/**
+ * Expo Config Plugin — adds MarkdownView as an SPM dependency to the
+ * host app's Xcode project during `expo prebuild`.
+ *
+ * Without this step the pod can't compile `import MarkdownView` because
+ * CocoaPods has no way to pull in Swift Package Manager-only packages.
+ *
+ * Usage in app.config.ts / app.json:
+ *   plugins: ['@tinglinzh/react-native-markdownview']
+ */
+
+const { withXcodeProject } = require('@expo/config-plugins');
+const crypto = require('crypto');
+
+const MARKDOWNVIEW_REPO = 'https://github.com/HumanInterfaceDesign/MarkdownView';
+const MARKDOWNVIEW_BRANCH = 'main';
+const PRODUCT_NAME = 'MarkdownView';
+
+/**
+ * Deterministic 24-char uppercase hex UUID derived from a seed string.
+ * Using a fixed seed means `prebuild` is idempotent — re-running it won't
+ * add duplicate entries to the pbxproj file.
+ */
+function uuid(seed) {
+  return crypto.createHash('sha256').update(seed).digest('hex').toUpperCase().slice(0, 24);
+}
+
+const PKG_REF_UUID   = uuid('RNMarkdownView-XCRemoteSwiftPackageReference');
+const PROD_DEP_UUID  = uuid('RNMarkdownView-XCSwiftPackageProductDependency');
+const BUILD_FILE_UUID = uuid('RNMarkdownView-PBXBuildFile');
+
+/**
+ * @param {import('@expo/config-plugins').ExpoConfig} config
+ */
+const withMarkdownViewSPM = (config) => {
+  return withXcodeProject(config, (modConfig) => {
+    const project = modConfig.modResults;
+    const pbx = project.hash.project.objects;
+
+    // ── Guard: already added? ──────────────────────────────────────────────
+    const existingRefs = pbx['XCRemoteSwiftPackageReference'] || {};
+    const alreadyAdded = Object.values(existingRefs).some(
+      (ref) =>
+        ref &&
+        typeof ref === 'object' &&
+        typeof ref.repositoryURL === 'string' &&
+        ref.repositoryURL.includes('MarkdownView'),
+    );
+    if (alreadyAdded) return modConfig;
+
+    // ── 1. XCRemoteSwiftPackageReference ──────────────────────────────────
+    pbx['XCRemoteSwiftPackageReference'] = pbx['XCRemoteSwiftPackageReference'] || {};
+    pbx['XCRemoteSwiftPackageReference'][PKG_REF_UUID] = {
+      isa: 'XCRemoteSwiftPackageReference',
+      repositoryURL: `"${MARKDOWNVIEW_REPO}"`,
+      requirement: { branch: MARKDOWNVIEW_BRANCH, kind: 'branch' },
+    };
+    pbx['XCRemoteSwiftPackageReference'][`${PKG_REF_UUID}_comment`] =
+      `XCRemoteSwiftPackageReference "${PRODUCT_NAME}"`;
+
+    // ── 2. XCSwiftPackageProductDependency ────────────────────────────────
+    pbx['XCSwiftPackageProductDependency'] = pbx['XCSwiftPackageProductDependency'] || {};
+    pbx['XCSwiftPackageProductDependency'][PROD_DEP_UUID] = {
+      isa: 'XCSwiftPackageProductDependency',
+      package: PKG_REF_UUID,
+      productName: PRODUCT_NAME,
+    };
+    pbx['XCSwiftPackageProductDependency'][`${PROD_DEP_UUID}_comment`] = PRODUCT_NAME;
+
+    // ── 3. PBXBuildFile ───────────────────────────────────────────────────
+    pbx['PBXBuildFile'] = pbx['PBXBuildFile'] || {};
+    pbx['PBXBuildFile'][BUILD_FILE_UUID] = {
+      isa: 'PBXBuildFile',
+      productRef: PROD_DEP_UUID,
+    };
+    pbx['PBXBuildFile'][`${BUILD_FILE_UUID}_comment`] = `${PRODUCT_NAME} in Frameworks`;
+
+    // ── 4. PBXProject.packageReferences ──────────────────────────────────
+    const projectSection = pbx['PBXProject'] || {};
+    const projectObj = Object.values(projectSection).find(
+      (v) => v && typeof v === 'object' && v.isa === 'PBXProject',
+    );
+    if (projectObj) {
+      projectObj.packageReferences = projectObj.packageReferences || [];
+      if (!projectObj.packageReferences.some((r) => r.value === PKG_REF_UUID)) {
+        projectObj.packageReferences.push({
+          value: PKG_REF_UUID,
+          comment: `XCRemoteSwiftPackageReference "${PRODUCT_NAME}"`,
+        });
+      }
+    }
+
+    // ── 5. Add to the main app target ─────────────────────────────────────
+    const targetName = modConfig.modRequest.projectName;
+    const nativeTargets = pbx['PBXNativeTarget'] || {};
+
+    for (const [, target] of Object.entries(nativeTargets)) {
+      if (!target || typeof target !== 'object') continue;
+
+      // pbxproj stores names with surrounding quotes; handle both forms.
+      const name = typeof target.name === 'string'
+        ? target.name.replace(/^"|"$/g, '')
+        : '';
+      if (name !== targetName) continue;
+
+      // packageProductDependencies
+      target.packageProductDependencies = target.packageProductDependencies || [];
+      if (!target.packageProductDependencies.some((d) => d.value === PROD_DEP_UUID)) {
+        target.packageProductDependencies.push({
+          value: PROD_DEP_UUID,
+          comment: PRODUCT_NAME,
+        });
+      }
+
+      // Add build file to PBXFrameworksBuildPhase
+      for (const phaseRef of target.buildPhases || []) {
+        const frameworksSection = pbx['PBXFrameworksBuildPhase'] || {};
+        const phase = frameworksSection[phaseRef.value];
+        if (!phase) continue;
+
+        phase.files = phase.files || [];
+        if (!phase.files.some((f) => f.value === BUILD_FILE_UUID)) {
+          phase.files.push({
+            value: BUILD_FILE_UUID,
+            comment: `${PRODUCT_NAME} in Frameworks`,
+          });
+        }
+        break;
+      }
+      break;
+    }
+
+    return modConfig;
+  });
+};
+
+module.exports = withMarkdownViewSPM;

package/react-native-markdownview.podspec

@@ -15,11 +15,11 @@ Pod::Spec.new do |s|
   s.source_files  = "ios/**/*.{h,m,mm,swift}"
   s.swift_version = "5.9"
 
-  # Exposes React Objective-C headers to Swift files inside this pod.
+  # Allow the Swift compiler to find the MarkdownView module when it is added
+  # to the host app via Xcode's Swift Package integration.
+  # Framework targets cannot use bridging headers; ObjC↔Swift interop is handled
+  # via the auto-generated "-Swift.h" header imported in RNMarkdownViewManager.m.
   s.pod_target_xcconfig = {
-    "SWIFT_OBJC_BRIDGING_HEADER" => "$(PODS_TARGET_SRCROOT)/ios/react-native-markdownview-Bridging-Header.h",
-    # Allow the Swift compiler to find the MarkdownView Swift module when it is
-    # added to the host app via SPM (Xcode embeds SPM-built modules here).
     "SWIFT_INCLUDE_PATHS" => "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/PackageFrameworks/**",
   }
 

package/ios/RNMarkdownViewManager.swift

@@ -1,16 +0,0 @@
-import React
-import UIKit
-
-/// Old Architecture view manager.
-/// The ObjC bridge in RNMarkdownViewManager.m exports props and this class.
-@objc(RNMarkdownViewManager)
-final class RNMarkdownViewManager: RCTViewManager {
-
-    override func view() -> UIView! {
-        RNMarkdownView()
-    }
-
-    override static func requiresMainQueueSetup() -> Bool {
-        true
-    }
-}

package/ios/react-native-markdownview-Bridging-Header.h

@@ -1,12 +0,0 @@
-/**
- * Bridging header for Swift ↔ Objective-C interop within this pod.
- *
- * The CocoaPods build system picks up SWIFT_OBJC_BRIDGING_HEADER via
- * the pod_target_xcconfig in the podspec and makes these React Native
- * Objective-C headers visible to all Swift source files in the pod.
- */
-#import <React/RCTViewManager.h>
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-#import <React/RCTView.h>
-#import <React/RCTUIManager.h>