diff --git a/README.md b/README.md index f107fd78..b46f2cab 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - ⚡ Fully native experience (selection, spellcheck, autocomplete) - 🔧 Customizable logic - 🎨 Customizable styles -- 🌐 Universal support (Android, iOS, web) +- 🌐 Universal support (Android, iOS, macOS, web) - 🏗️ Supports only the New Architecture ## Installation diff --git a/RNLiveMarkdown.podspec b/RNLiveMarkdown.podspec index 21de59da..a2d576cd 100644 --- a/RNLiveMarkdown.podspec +++ b/RNLiveMarkdown.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.authors = package["author"] - s.platforms = { :ios => "11.0", :visionos => "1.0" } + s.platforms = { :ios => "11.0", :visionos => "1.0", :osx => "10.15" } s.source = { :git => "https://github.com/expensify/react-native-live-markdown.git", :tag => "#{s.version}" } s.source_files = "apple/**/*.{h,m,mm}", "cpp/**/*.{h,cpp}" diff --git a/apple/MarkdownLayoutManager.h b/apple/MarkdownLayoutManager.h index 9e965e11..1d8d2f30 100644 --- a/apple/MarkdownLayoutManager.h +++ b/apple/MarkdownLayoutManager.h @@ -1,4 +1,3 @@ -#import #import #import diff --git a/apple/MarkdownLayoutManager.mm b/apple/MarkdownLayoutManager.mm index 4ea7da64..c6f1c01a 100644 --- a/apple/MarkdownLayoutManager.mm +++ b/apple/MarkdownLayoutManager.mm @@ -1,4 +1,5 @@ #import +#import @implementation MarkdownLayoutManager diff --git a/apple/RCTMarkdownStyle.h b/apple/RCTMarkdownStyle.h index fd88fcaf..a8e69f1e 100644 --- a/apple/RCTMarkdownStyle.h +++ b/apple/RCTMarkdownStyle.h @@ -1,4 +1,4 @@ -#import +#import #import @@ -6,29 +6,29 @@ NS_ASSUME_NONNULL_BEGIN @interface RCTMarkdownStyle : NSObject -@property (nonatomic) UIColor *syntaxColor; -@property (nonatomic) UIColor *linkColor; +@property (nonatomic) RCTUIColor *syntaxColor; +@property (nonatomic) RCTUIColor *linkColor; @property (nonatomic) CGFloat h1FontSize; @property (nonatomic) CGFloat emojiFontSize; @property (nonatomic) NSString *emojiFontFamily; -@property (nonatomic) UIColor *blockquoteBorderColor; +@property (nonatomic) RCTUIColor *blockquoteBorderColor; @property (nonatomic) CGFloat blockquoteBorderWidth; @property (nonatomic) CGFloat blockquoteMarginLeft; @property (nonatomic) CGFloat blockquotePaddingLeft; @property (nonatomic) NSString *codeFontFamily; @property (nonatomic) CGFloat codeFontSize; -@property (nonatomic) UIColor *codeColor; -@property (nonatomic) UIColor *codeBackgroundColor; +@property (nonatomic) RCTUIColor *codeColor; +@property (nonatomic) RCTUIColor *codeBackgroundColor; @property (nonatomic) NSString *preFontFamily; @property (nonatomic) CGFloat preFontSize; -@property (nonatomic) UIColor *preColor; -@property (nonatomic) UIColor *preBackgroundColor; -@property (nonatomic) UIColor *mentionHereColor; -@property (nonatomic) UIColor *mentionHereBackgroundColor; -@property (nonatomic) UIColor *mentionUserColor; -@property (nonatomic) UIColor *mentionUserBackgroundColor; -@property (nonatomic) UIColor *mentionReportColor; -@property (nonatomic) UIColor *mentionReportBackgroundColor; +@property (nonatomic) RCTUIColor *preColor; +@property (nonatomic) RCTUIColor *preBackgroundColor; +@property (nonatomic) RCTUIColor *mentionHereColor; +@property (nonatomic) RCTUIColor *mentionHereBackgroundColor; +@property (nonatomic) RCTUIColor *mentionUserColor; +@property (nonatomic) RCTUIColor *mentionUserBackgroundColor; +@property (nonatomic) RCTUIColor *mentionReportColor; +@property (nonatomic) RCTUIColor *mentionReportBackgroundColor; - (instancetype)initWithStruct:(const facebook::react::MarkdownTextInputDecoratorViewMarkdownStyleStruct &)style; diff --git a/src/styleUtils.ts b/src/styleUtils.ts index 0592c75c..17404a28 100644 --- a/src/styleUtils.ts +++ b/src/styleUtils.ts @@ -7,6 +7,7 @@ type PartialMarkdownStyle = Partial<{ const FONT_FAMILY_MONOSPACE = Platform.select({ ios: 'Courier', + macos: 'Menlo', default: 'monospace', });