software-mansion · hejsztynx · Sep 1, 2026 · Sep 1, 2026 · Sep 2, 2026
diff --git a/Package.swift b/Package.swift
@@ -29,8 +29,8 @@ let package = Package(
                 "ios"
             ],
             publicHeadersPath: "ios",
-            cSettings: [.headerSearchPath("cpp/GumboParser"), .headerSearchPath("cpp/parser"), .headerSearchPath("ios"), .headerSearchPath("ios/config"), .headerSearchPath("ios/enrichedInputTextView"), .headerSearchPath("ios/enrichedTextTextView"), .headerSearchPath("ios/extensions"), .headerSearchPath("ios/generated/ReactCodegen/ReactNativeEnrichedSpec"), .headerSearchPath("ios/htmlParser"), .headerSearchPath("ios/inputAttributesManager"), .headerSearchPath("ios/inputHtmlParser"), .headerSearchPath("ios/interfaces"), .headerSearchPath("ios/internals"), .headerSearchPath("ios/textHtmlParser"), .headerSearchPath("ios/utils"), .headerSearchPath("."), .unsafeFlags(["-include", "react-native-spm-prefix.h"])],
-            cxxSettings: [.headerSearchPath("cpp/GumboParser"), .headerSearchPath("cpp/parser"), .headerSearchPath("ios"), .headerSearchPath("ios/config"), .headerSearchPath("ios/enrichedInputTextView"), .headerSearchPath("ios/enrichedTextTextView"), .headerSearchPath("ios/extensions"), .headerSearchPath("ios/generated/ReactCodegen/ReactNativeEnrichedSpec"), .headerSearchPath("ios/htmlParser"), .headerSearchPath("ios/inputAttributesManager"), .headerSearchPath("ios/inputHtmlParser"), .headerSearchPath("ios/interfaces"), .headerSearchPath("ios/internals"), .headerSearchPath("ios/textHtmlParser"), .headerSearchPath("ios/utils"), .headerSearchPath("."), .unsafeFlags(["-include", "react-native-spm-prefix.h"]), .define("DEBUG", .when(configuration: .debug)), .define("NDEBUG", .when(configuration: .release))],
+            cSettings: [.headerSearchPath("cpp/GumboParser"), .headerSearchPath("cpp/parser"), .headerSearchPath("ios"), .headerSearchPath("."), .unsafeFlags(["-include", "react-native-spm-prefix.h"])],
+            cxxSettings: [.headerSearchPath("cpp/GumboParser"), .headerSearchPath("cpp/parser"), .headerSearchPath("ios"), .headerSearchPath("."), .unsafeFlags(["-include", "react-native-spm-prefix.h"]), .define("DEBUG", .when(configuration: .debug)), .define("NDEBUG", .when(configuration: .release))],
             linkerSettings: [.linkedFramework("UIKit"), .linkedFramework("Foundation"), .linkedFramework("CoreGraphics")]
         ),
     ],

diff --git a/ReactNativeEnrichedHtml.podspec b/ReactNativeEnrichedHtml.podspec
@@ -16,8 +16,10 @@ Pod::Spec.new do |s|
   s.source_files = ["ios/**/*.{h,m,mm,cpp}", "cpp/**/*.{h,hpp,c,cpp}"]
   s.exclude_files = ["cpp/tests/**"]
   s.private_header_files = "ios/**/*.h"
+  s.header_mappings_dir = "."
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}" "${PODS_TARGET_SRCROOT}/cpp/parser" "${PODS_TARGET_SRCROOT}/cpp/GumboParser"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}/ios" "${PODS_TARGET_SRCROOT}/cpp/parser" "${PODS_TARGET_SRCROOT}/cpp/GumboParser"',
+    'USE_HEADERMAP' => 'NO'
   }
 
 # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.

diff --git a/ios/EnrichedTextInputView.h b/ios/EnrichedTextInputView.h
@@ -1,12 +1,12 @@
 #pragma once
-#import "BaseStyleProtocol.h"
-#import "EnrichedConfig.h"
-#import "EnrichedInputTextView.h"
-#import "EnrichedViewHost.h"
-#import "InputAttributesManager.h"
-#import "InputHtmlParser.h"
-#import "LinkData.h"
-#import "MediaAttachment.h"
+#import "config/EnrichedConfig.h"
+#import "enrichedInputTextView/EnrichedInputTextView.h"
+#import "inputAttributesManager/InputAttributesManager.h"
+#import "inputHtmlParser/InputHtmlParser.h"
+#import "interfaces/BaseStyleProtocol.h"
+#import "interfaces/EnrichedViewHost.h"
+#import "interfaces/LinkData.h"
+#import "interfaces/MediaAttachment.h"
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
 

diff --git a/ios/EnrichedTextInputView.mm b/ios/EnrichedTextInputView.mm
@@ -1,25 +1,25 @@
 #import "EnrichedTextInputView.h"
-#import "AlignmentUtils.h"
-#import "AttachmentLayoutUtils.h"
 #import "CoreText/CoreText.h"
-#import "DotReplacementUtils.h"
-#import "EnrichedTextInputViewComponentDescriptor.h"
-#import "HtmlParser.h"
-#import "ImageAttachment.h"
-#import "KeyboardUtils.h"
-#import "LayoutManagerExtension.h"
-#import "ParagraphAttributesUtils.h"
-#import "ShortcutsUtils.h"
-#import "StringExtension.h"
-#import "StyleHeaders.h"
-#import "StyleUtils.h"
-#import "TextBlockTapGestureRecognizer.h"
-#import "TextInsertionUtils.h"
-#import "WordsUtils.h"
-#import "ZeroWidthSpaceUtils.h"
-#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
-#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
-#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/RCTComponentViewHelpers.h"
+#import "extensions/LayoutManagerExtension.h"
+#import "extensions/StringExtension.h"
+#import "generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
+#import "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#import "generated/ReactCodegen/ReactNativeEnrichedSpec/RCTComponentViewHelpers.h"
+#import "htmlParser/HtmlParser.h"
+#import "interfaces/ImageAttachment.h"
+#import "interfaces/StyleHeaders.h"
+#import "internals/EnrichedTextInputViewComponentDescriptor.h"
+#import "utils/AlignmentUtils.h"
+#import "utils/AttachmentLayoutUtils.h"
+#import "utils/DotReplacementUtils.h"
+#import "utils/KeyboardUtils.h"
+#import "utils/ParagraphAttributesUtils.h"
+#import "utils/ShortcutsUtils.h"
+#import "utils/StyleUtils.h"
+#import "utils/TextBlockTapGestureRecognizer.h"
+#import "utils/TextInsertionUtils.h"
+#import "utils/WordsUtils.h"
+#import "utils/ZeroWidthSpaceUtils.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/UIView+React.h>

diff --git a/ios/EnrichedTextView.h b/ios/EnrichedTextView.h
@@ -1,8 +1,8 @@
 #pragma once
-#import "EnrichedConfig.h"
-#import "EnrichedViewHost.h"
-#import "MediaAttachment.h"
-#import "MentionParams.h"
+#import "config/EnrichedConfig.h"
+#import "interfaces/EnrichedViewHost.h"
+#import "interfaces/MediaAttachment.h"
+#import "interfaces/MentionParams.h"
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
 

diff --git a/ios/EnrichedTextView.mm b/ios/EnrichedTextView.mm
@@ -1,19 +1,19 @@
 #import "EnrichedTextView.h"
-#import "AttachmentLayoutUtils.h"
-#import "EnrichedTextComponentDescriptor.h"
-#import "EnrichedTextStyleHeaders.h"
-#import "EnrichedTextTextView.h"
-#import "EnrichedTextTouchHandler.h"
-#import "LayoutManagerExtension.h"
-#import "LinkData.h"
-#import "MentionParams.h"
-#import "MentionStyleProps.h"
-#import "StringExtension.h"
-#import "StyleUtils.h"
-#import "TextDecorationLineEnum.h"
-#import "TextHtmlParser.h"
-#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
-#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#import "enrichedTextTextView/EnrichedTextTextView.h"
+#import "extensions/LayoutManagerExtension.h"
+#import "extensions/StringExtension.h"
+#import "generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
+#import "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#import "interfaces/EnrichedTextStyleHeaders.h"
+#import "interfaces/LinkData.h"
+#import "interfaces/MentionParams.h"
+#import "interfaces/MentionStyleProps.h"
+#import "interfaces/TextDecorationLineEnum.h"
+#import "internals/EnrichedTextComponentDescriptor.h"
+#import "textHtmlParser/TextHtmlParser.h"
+#import "utils/AttachmentLayoutUtils.h"
+#import "utils/EnrichedTextTouchHandler.h"
+#import "utils/StyleUtils.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <folly/dynamic.h>

diff --git a/ios/config/EnrichedConfig.h b/ios/config/EnrichedConfig.h
@@ -1,7 +1,7 @@
 #pragma once
-#import "LinkRegexConfig.h"
-#import "MentionStyleProps.h"
-#import "TextDecorationLineEnum.h"
+#import "interfaces/LinkRegexConfig.h"
+#import "interfaces/MentionStyleProps.h"
+#import "interfaces/TextDecorationLineEnum.h"
 #import <UIKit/UIKit.h>
 
 @interface EnrichedConfig : NSObject <NSCopying>

diff --git a/ios/config/EnrichedConfig.mm b/ios/config/EnrichedConfig.mm
@@ -1,4 +1,4 @@
-#import <EnrichedConfig.h>
+#import "config/EnrichedConfig.h"
 #import <React/RCTFont.h>
 
 @implementation EnrichedConfig {

diff --git a/ios/enrichedInputTextView/EnrichedInputTextView.mm b/ios/enrichedInputTextView/EnrichedInputTextView.mm
@@ -1,10 +1,10 @@
 #import "EnrichedInputTextView.h"
-#import "AlignmentUtils.h"
 #import "EnrichedTextInputView.h"
-#import "HtmlParser.h"
-#import "StringExtension.h"
-#import "TextInsertionUtils.h"
-#import "TextListsUtils.h"
+#import "extensions/StringExtension.h"
+#import "htmlParser/HtmlParser.h"
+#import "utils/AlignmentUtils.h"
+#import "utils/TextInsertionUtils.h"
+#import "utils/TextListsUtils.h"
 #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 @implementation EnrichedInputTextView

diff --git a/ios/enrichedTextTextView/EnrichedTextTextView.mm b/ios/enrichedTextTextView/EnrichedTextTextView.mm
@@ -1,7 +1,7 @@
 #import "EnrichedTextTextView.h"
-#import "EnrichedTextTouchHandler.h"
 #import "EnrichedTextView.h"
-#import "HtmlParser.h"
+#import "htmlParser/HtmlParser.h"
+#import "utils/EnrichedTextTouchHandler.h"
 #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 @implementation EnrichedTextTextView

diff --git a/ios/extensions/LayoutManagerExtension.mm b/ios/extensions/LayoutManagerExtension.mm
@@ -1,9 +1,9 @@
 #import "LayoutManagerExtension.h"
 #import "ColorExtension.h"
-#import "EnrichedViewHost.h"
-#import "RangeUtils.h"
-#import "StyleHeaders.h"
-#import "WeakBox.h"
+#import "interfaces/EnrichedViewHost.h"
+#import "interfaces/StyleHeaders.h"
+#import "utils/RangeUtils.h"
+#import "utils/WeakBox.h"
 #import <objc/runtime.h>
 
 @implementation NSLayoutManager (LayoutManagerExtension)

diff --git a/ios/htmlParser/HtmlParser.h b/ios/htmlParser/HtmlParser.h
@@ -1,5 +1,5 @@
 #pragma once
-#import "EnrichedViewHost.h"
+#import "interfaces/EnrichedViewHost.h"
 #import <UIKit/UIKit.h>
 
 @class EnrichedConfig;

diff --git a/ios/htmlParser/HtmlParser.mm b/ios/htmlParser/HtmlParser.mm
@@ -1,13 +1,13 @@
 #import "HtmlParser.h"
-#import "AlignmentEntry.h"
-#import "AlignmentUtils.h"
-#import "EnrichedConfig.h"
-#import "ImageData.h"
-#import "LinkData.h"
-#import "MentionParams.h"
-#import "StringExtension.h"
-#import "StyleHeaders.h"
-#import "StylePair.h"
+#import "config/EnrichedConfig.h"
+#import "extensions/StringExtension.h"
+#import "interfaces/AlignmentEntry.h"
+#import "interfaces/ImageData.h"
+#import "interfaces/LinkData.h"
+#import "interfaces/MentionParams.h"
+#import "interfaces/StyleHeaders.h"
+#import "interfaces/StylePair.h"
+#import "utils/AlignmentUtils.h"
 
 #include "GumboParser.hpp"
 

diff --git a/ios/inputAttributesManager/InputAttributesManager.mm b/ios/inputAttributesManager/InputAttributesManager.mm
@@ -1,13 +1,13 @@
 #import "InputAttributesManager.h"
-#import "AlignmentUtils.h"
-#import "ArrayExtension.h"
-#import "AttributeEntry.h"
 #import "EnrichedTextInputView.h"
-#import "ParagraphAttributesUtils.h"
-#import "RangeUtils.h"
-#import "StyleHeaders.h"
-#import "StyleUtils.h"
-#import "ZeroWidthSpaceUtils.h"
+#import "extensions/ArrayExtension.h"
+#import "interfaces/AttributeEntry.h"
+#import "interfaces/StyleHeaders.h"
+#import "utils/AlignmentUtils.h"
+#import "utils/ParagraphAttributesUtils.h"
+#import "utils/RangeUtils.h"
+#import "utils/StyleUtils.h"
+#import "utils/ZeroWidthSpaceUtils.h"
 
 @implementation InputAttributesManager {
   NSMutableArray<NSValue *> *_dirtyRanges;

diff --git a/ios/inputHtmlParser/InputHtmlParser.mm b/ios/inputHtmlParser/InputHtmlParser.mm
@@ -1,11 +1,11 @@
 #import "InputHtmlParser.h"
-#import "AlignmentEntry.h"
 #import "EnrichedTextInputView.h"
-#import "HtmlParser.h"
-#import "StringExtension.h"
-#import "StyleHeaders.h"
-#import "StyleUtils.h"
-#import "TextInsertionUtils.h"
+#import "extensions/StringExtension.h"
+#import "htmlParser/HtmlParser.h"
+#import "interfaces/AlignmentEntry.h"
+#import "interfaces/StyleHeaders.h"
+#import "utils/StyleUtils.h"
+#import "utils/TextInsertionUtils.h"
 #import <React/RCTLog.h>
 
 @implementation InputHtmlParser {

diff --git a/ios/interfaces/EnrichedViewHost.h b/ios/interfaces/EnrichedViewHost.h
@@ -1,7 +1,7 @@
 #pragma once
-#import "EnrichedConfig.h"
-#import "InputAttributesManager.h"
 #import "StyleTypeEnum.h"
+#import "config/EnrichedConfig.h"
+#import "inputAttributesManager/InputAttributesManager.h"
 #import <UIKit/UIKit.h>
 
 @protocol EnrichedViewHost <NSObject>

diff --git a/ios/interfaces/ImageAttachment.mm b/ios/interfaces/ImageAttachment.mm
@@ -1,5 +1,5 @@
 #import "ImageAttachment.h"
-#import "ImageExtension.h"
+#import "extensions/ImageExtension.h"
 
 // NSTextStorage frequently recreates NSTextAttachment objects during attribute
 // invalidation (e.g. on every keystroke). Without this cache each recreation

diff --git a/ios/interfaces/LinkRegexConfig.h b/ios/interfaces/LinkRegexConfig.h
@@ -1,5 +1,5 @@
 #pragma once
-#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#import "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
 #import <UIKit/UIKit.h>
 
 using namespace facebook::react;

diff --git a/ios/interfaces/LinkRegexConfig.mm b/ios/interfaces/LinkRegexConfig.mm
@@ -1,5 +1,5 @@
 #import "LinkRegexConfig.h"
-#import "StringExtension.h"
+#import "extensions/StringExtension.h"
 
 @implementation LinkRegexConfig
 

diff --git a/ios/interfaces/MentionStyleProps.mm b/ios/interfaces/MentionStyleProps.mm
@@ -1,5 +1,5 @@
 #import "MentionStyleProps.h"
-#import "StringExtension.h"
+#import "extensions/StringExtension.h"
 #import <React/RCTConversions.h>
 
 @implementation MentionStyleProps

diff --git a/ios/interfaces/StyleBase.mm b/ios/interfaces/StyleBase.mm
@@ -1,9 +1,9 @@
 #import "StyleBase.h"
 #import "AttributeEntry.h"
-#import "OccurenceUtils.h"
-#import "RangeUtils.h"
-#import "TextListsUtils.h"
-#import "ZeroWidthSpaceUtils.h"
+#import "utils/OccurenceUtils.h"
+#import "utils/RangeUtils.h"
+#import "utils/TextListsUtils.h"
+#import "utils/ZeroWidthSpaceUtils.h"
 
 @implementation StyleBase
 

diff --git a/ios/internals/EnrichedTextComponentDescriptor.h b/ios/internals/EnrichedTextComponentDescriptor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "EnrichedTextViewShadowNode.h"
-#include "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#include "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 

diff --git a/ios/internals/EnrichedTextInputViewComponentDescriptor.h b/ios/internals/EnrichedTextInputViewComponentDescriptor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "EnrichedTextInputViewShadowNode.h"
-#include "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#include "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 

diff --git a/ios/internals/EnrichedTextInputViewShadowNode.h b/ios/internals/EnrichedTextInputViewShadowNode.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "EnrichedTextInputViewState.h"
-#include "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
-#include "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#include "generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
+#include "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
 #include <jsi/jsi.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutConstraints.h>

diff --git a/ios/internals/EnrichedTextInputViewShadowNode.mm b/ios/internals/EnrichedTextInputViewShadowNode.mm
@@ -1,6 +1,6 @@
 #import "EnrichedTextInputViewShadowNode.h"
 #import "CoreText/CoreText.h"
-#import <EnrichedTextInputView.h>
+#import "EnrichedTextInputView.h"
 #import <React/RCTShadowView+Layout.h>
 #import <react/utils/ManagedObjectWrapper.h>
 #import <yoga/Yoga.h>

diff --git a/ios/internals/EnrichedTextViewShadowNode.h b/ios/internals/EnrichedTextViewShadowNode.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "EnrichedTextViewState.h"
-#include "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
-#include "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
+#include "generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
+#include "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
 #include <jsi/jsi.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutConstraints.h>

diff --git a/ios/internals/EnrichedTextViewShadowNode.mm b/ios/internals/EnrichedTextViewShadowNode.mm
@@ -1,6 +1,6 @@
 #import "EnrichedTextViewShadowNode.h"
 #import "CoreText/CoreText.h"
-#import <EnrichedTextView.h>
+#import "EnrichedTextView.h"
 #import <React/RCTShadowView+Layout.h>
 #import <react/utils/ManagedObjectWrapper.h>
 

diff --git a/ios/styles/AlignmentStyle.mm b/ios/styles/AlignmentStyle.mm
@@ -1,6 +1,6 @@
-#import "AlignmentUtils.h"
-#import "StyleHeaders.h"
-#import "TextListsUtils.h"
+#import "interfaces/StyleHeaders.h"
+#import "utils/AlignmentUtils.h"
+#import "utils/TextListsUtils.h"
 
 @implementation AlignmentStyle
 

diff --git a/ios/styles/BlockQuoteStyle.mm b/ios/styles/BlockQuoteStyle.mm
@@ -1,6 +1,6 @@
-#import "ColorExtension.h"
 #import "EnrichedTextInputView.h"
-#import "StyleHeaders.h"
+#import "extensions/ColorExtension.h"
+#import "interfaces/StyleHeaders.h"
 
 @implementation BlockQuoteStyle
 

diff --git a/ios/styles/BoldStyle.mm b/ios/styles/BoldStyle.mm
@@ -1,6 +1,6 @@
 #import "EnrichedTextInputView.h"
-#import "FontExtension.h"
-#import "StyleHeaders.h"
+#import "extensions/FontExtension.h"
+#import "interfaces/StyleHeaders.h"
 
 @implementation BoldStyle : StyleBase