Skip to content

Commit b82273c

Browse files
hejsztynxhejsztynx
committed
feat: unify expected import structure across cocoapods and spm
1 parent 614e35e commit b82273c

60 files changed

Lines changed: 186 additions & 184 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ReactNativeEnrichedHtml.podspec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ Pod::Spec.new do |s|
1616
s.source_files = ["ios/**/*.{h,m,mm,cpp}", "cpp/**/*.{h,hpp,c,cpp}"]
1717
s.exclude_files = ["cpp/tests/**"]
1818
s.private_header_files = "ios/**/*.h"
19+
s.header_mappings_dir = "."
1920
s.pod_target_xcconfig = {
20-
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}" "${PODS_TARGET_SRCROOT}/cpp/parser" "${PODS_TARGET_SRCROOT}/cpp/GumboParser"'
21+
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}/ios" "${PODS_TARGET_SRCROOT}/cpp/parser" "${PODS_TARGET_SRCROOT}/cpp/GumboParser"',
22+
'USE_HEADERMAP' => 'NO'
2123
}
2224

2325
# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.

‎ios/EnrichedTextInputView.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
2-
#import "BaseStyleProtocol.h"
3-
#import "EnrichedConfig.h"
4-
#import "EnrichedInputTextView.h"
5-
#import "EnrichedViewHost.h"
6-
#import "InputAttributesManager.h"
7-
#import "InputHtmlParser.h"
8-
#import "LinkData.h"
9-
#import "MediaAttachment.h"
2+
#import "config/EnrichedConfig.h"
3+
#import "enrichedInputTextView/EnrichedInputTextView.h"
4+
#import "inputAttributesManager/InputAttributesManager.h"
5+
#import "inputHtmlParser/InputHtmlParser.h"
6+
#import "interfaces/BaseStyleProtocol.h"
7+
#import "interfaces/EnrichedViewHost.h"
8+
#import "interfaces/LinkData.h"
9+
#import "interfaces/MediaAttachment.h"
1010
#import <React/RCTViewComponentView.h>
1111
#import <UIKit/UIKit.h>
1212

‎ios/EnrichedTextInputView.mm‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
#import "EnrichedTextInputView.h"
2-
#import "AlignmentUtils.h"
3-
#import "AttachmentLayoutUtils.h"
42
#import "CoreText/CoreText.h"
5-
#import "DotReplacementUtils.h"
6-
#import "EnrichedTextInputViewComponentDescriptor.h"
7-
#import "HtmlParser.h"
8-
#import "ImageAttachment.h"
9-
#import "KeyboardUtils.h"
10-
#import "LayoutManagerExtension.h"
11-
#import "ParagraphAttributesUtils.h"
12-
#import "ShortcutsUtils.h"
13-
#import "StringExtension.h"
14-
#import "StyleHeaders.h"
15-
#import "StyleUtils.h"
16-
#import "TextBlockTapGestureRecognizer.h"
17-
#import "TextInsertionUtils.h"
18-
#import "WordsUtils.h"
19-
#import "ZeroWidthSpaceUtils.h"
20-
#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
21-
#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
22-
#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/RCTComponentViewHelpers.h"
3+
#import "extensions/LayoutManagerExtension.h"
4+
#import "extensions/StringExtension.h"
5+
#import "generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
6+
#import "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
7+
#import "generated/ReactCodegen/ReactNativeEnrichedSpec/RCTComponentViewHelpers.h"
8+
#import "htmlParser/HtmlParser.h"
9+
#import "interfaces/ImageAttachment.h"
10+
#import "interfaces/StyleHeaders.h"
11+
#import "internals/EnrichedTextInputViewComponentDescriptor.h"
12+
#import "utils/AlignmentUtils.h"
13+
#import "utils/AttachmentLayoutUtils.h"
14+
#import "utils/DotReplacementUtils.h"
15+
#import "utils/KeyboardUtils.h"
16+
#import "utils/ParagraphAttributesUtils.h"
17+
#import "utils/ShortcutsUtils.h"
18+
#import "utils/StyleUtils.h"
19+
#import "utils/TextBlockTapGestureRecognizer.h"
20+
#import "utils/TextInsertionUtils.h"
21+
#import "utils/WordsUtils.h"
22+
#import "utils/ZeroWidthSpaceUtils.h"
2323
#import <React/RCTConversions.h>
2424
#import <React/RCTFabricComponentsPlugins.h>
2525
#import <React/UIView+React.h>

‎ios/EnrichedTextView.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
2-
#import "EnrichedConfig.h"
3-
#import "EnrichedViewHost.h"
4-
#import "MediaAttachment.h"
5-
#import "MentionParams.h"
2+
#import "config/EnrichedConfig.h"
3+
#import "interfaces/EnrichedViewHost.h"
4+
#import "interfaces/MediaAttachment.h"
5+
#import "interfaces/MentionParams.h"
66
#import <React/RCTViewComponentView.h>
77
#import <UIKit/UIKit.h>
88

‎ios/EnrichedTextView.mm‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#import "EnrichedTextView.h"
2-
#import "AttachmentLayoutUtils.h"
3-
#import "EnrichedTextComponentDescriptor.h"
4-
#import "EnrichedTextStyleHeaders.h"
5-
#import "EnrichedTextTextView.h"
6-
#import "EnrichedTextTouchHandler.h"
7-
#import "LayoutManagerExtension.h"
8-
#import "LinkData.h"
9-
#import "MentionParams.h"
10-
#import "MentionStyleProps.h"
11-
#import "StringExtension.h"
12-
#import "StyleUtils.h"
13-
#import "TextDecorationLineEnum.h"
14-
#import "TextHtmlParser.h"
15-
#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
16-
#import "ios/generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
2+
#import "enrichedTextTextView/EnrichedTextTextView.h"
3+
#import "extensions/LayoutManagerExtension.h"
4+
#import "extensions/StringExtension.h"
5+
#import "generated/ReactCodegen/ReactNativeEnrichedSpec/EventEmitters.h"
6+
#import "generated/ReactCodegen/ReactNativeEnrichedSpec/Props.h"
7+
#import "interfaces/EnrichedTextStyleHeaders.h"
8+
#import "interfaces/LinkData.h"
9+
#import "interfaces/MentionParams.h"
10+
#import "interfaces/MentionStyleProps.h"
11+
#import "interfaces/TextDecorationLineEnum.h"
12+
#import "internals/EnrichedTextComponentDescriptor.h"
13+
#import "textHtmlParser/TextHtmlParser.h"
14+
#import "utils/AttachmentLayoutUtils.h"
15+
#import "utils/EnrichedTextTouchHandler.h"
16+
#import "utils/StyleUtils.h"
1717
#import <React/RCTConversions.h>
1818
#import <React/RCTFabricComponentsPlugins.h>
1919
#import <folly/dynamic.h>

‎ios/config/EnrichedConfig.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
2-
#import "LinkRegexConfig.h"
3-
#import "MentionStyleProps.h"
4-
#import "TextDecorationLineEnum.h"
2+
#import "interfaces/LinkRegexConfig.h"
3+
#import "interfaces/MentionStyleProps.h"
4+
#import "interfaces/TextDecorationLineEnum.h"
55
#import <UIKit/UIKit.h>
66

77
@interface EnrichedConfig : NSObject <NSCopying>

‎ios/config/EnrichedConfig.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#import <EnrichedConfig.h>
1+
#import "config/EnrichedConfig.h"
22
#import <React/RCTFont.h>
33

44
@implementation EnrichedConfig {

‎ios/enrichedInputTextView/EnrichedInputTextView.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#import "EnrichedInputTextView.h"
2-
#import "AlignmentUtils.h"
32
#import "EnrichedTextInputView.h"
4-
#import "HtmlParser.h"
5-
#import "StringExtension.h"
6-
#import "TextInsertionUtils.h"
7-
#import "TextListsUtils.h"
3+
#import "extensions/StringExtension.h"
4+
#import "htmlParser/HtmlParser.h"
5+
#import "utils/AlignmentUtils.h"
6+
#import "utils/TextInsertionUtils.h"
7+
#import "utils/TextListsUtils.h"
88
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
99

1010
@implementation EnrichedInputTextView

‎ios/enrichedTextTextView/EnrichedTextTextView.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "EnrichedTextTextView.h"
2-
#import "EnrichedTextTouchHandler.h"
32
#import "EnrichedTextView.h"
4-
#import "HtmlParser.h"
3+
#import "htmlParser/HtmlParser.h"
4+
#import "utils/EnrichedTextTouchHandler.h"
55
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
66

77
@implementation EnrichedTextTextView

‎ios/extensions/LayoutManagerExtension.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#import "LayoutManagerExtension.h"
22
#import "ColorExtension.h"
3-
#import "EnrichedViewHost.h"
4-
#import "RangeUtils.h"
5-
#import "StyleHeaders.h"
6-
#import "WeakBox.h"
3+
#import "interfaces/EnrichedViewHost.h"
4+
#import "interfaces/StyleHeaders.h"
5+
#import "utils/RangeUtils.h"
6+
#import "utils/WeakBox.h"
77
#import <objc/runtime.h>
88

99
@implementation NSLayoutManager (LayoutManagerExtension)

0 commit comments

Comments
 (0)