Skip to content

feat(iOS): move all styles in a separate file #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IvanIhnatsiuk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(iOS): move all styles in a separate file #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ios/EnrichedTextInputStyles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#import <Foundation/Foundation.h>
#import "StyleHeaders.h"

@class EnrichedTextInputView;

FOUNDATION_EXPORT NSDictionary<NSNumber *, id<BaseStyleProtocol>> *
EnrichedTextInputMakeStyles(__kindof EnrichedTextInputView *input);

FOUNDATION_EXPORT NSDictionary<NSNumber *, NSArray<NSNumber *> *> *
EnrichedTextInputConflictingStyles(void);

FOUNDATION_EXPORT NSDictionary<NSNumber *, NSArray<NSNumber *> *> *
EnrichedTextInputBlockingStyles(void);
77 changes: 77 additions & 0 deletions ios/EnrichedTextInputStyles.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
#import "EnrichedTextInputStyles.h"

NSDictionary<NSNumber *, id<BaseStyleProtocol>> *
EnrichedTextInputMakeStyles(__kindof EnrichedTextInputView *input) {
return @{
@([BoldStyle getStyleType]) : [[BoldStyle alloc] initWithInput:input],
@([ItalicStyle getStyleType]) : [[ItalicStyle alloc] initWithInput:input],
@([UnderlineStyle getStyleType]) : [[UnderlineStyle alloc] initWithInput:input],
@([StrikethroughStyle getStyleType]): [[StrikethroughStyle alloc] initWithInput:input],
@([InlineCodeStyle getStyleType]) : [[InlineCodeStyle alloc] initWithInput:input],
@([LinkStyle getStyleType]) : [[LinkStyle alloc] initWithInput:input],
@([MentionStyle getStyleType]) : [[MentionStyle alloc] initWithInput:input],
@([H1Style getStyleType]) : [[H1Style alloc] initWithInput:input],
@([H2Style getStyleType]) : [[H2Style alloc] initWithInput:input],
@([H3Style getStyleType]) : [[H3Style alloc] initWithInput:input],
@([UnorderedListStyle getStyleType]): [[UnorderedListStyle alloc] initWithInput:input],
@([OrderedListStyle getStyleType]) : [[OrderedListStyle alloc] initWithInput:input],
@([BlockQuoteStyle getStyleType]) : [[BlockQuoteStyle alloc] initWithInput:input],
@([CodeBlockStyle getStyleType]) : [[CodeBlockStyle alloc] initWithInput:input],
@([ImageStyle getStyleType]) : [[ImageStyle alloc] initWithInput:input],
};
}

NSDictionary<NSNumber *, NSArray<NSNumber *> *> *EnrichedTextInputConflictingStyles(void) {
static NSDictionary<NSNumber *, NSArray<NSNumber *> *> *dict;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
dict = @{
@([BoldStyle getStyleType]) : @[],
@([ItalicStyle getStyleType]) : @[],
@([UnderlineStyle getStyleType]) : @[],
@([StrikethroughStyle getStyleType]): @[],
@([InlineCodeStyle getStyleType]) : @[@([LinkStyle getStyleType]), @([MentionStyle getStyleType])],
@([LinkStyle getStyleType]) : @[@([InlineCodeStyle getStyleType]), @([LinkStyle getStyleType]), @([MentionStyle getStyleType])],
@([MentionStyle getStyleType]) : @[@([InlineCodeStyle getStyleType]), @([LinkStyle getStyleType])],
@([H1Style getStyleType]) : @[@([H2Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([H2Style getStyleType]) : @[@([H1Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([H3Style getStyleType]) : @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([UnorderedListStyle getStyleType]): @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([OrderedListStyle getStyleType]) : @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([BlockQuoteStyle getStyleType]) : @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([CodeBlockStyle getStyleType]) : @[
@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]),
@([BoldStyle getStyleType]), @([ItalicStyle getStyleType]), @([UnderlineStyle getStyleType]), @([StrikethroughStyle getStyleType]),
@([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
@([InlineCodeStyle getStyleType]), @([MentionStyle getStyleType]), @([LinkStyle getStyleType])
],
@([ImageStyle getStyleType]) : @[@([LinkStyle getStyleType]), @([MentionStyle getStyleType])]
};
});
return dict;
}

NSDictionary<NSNumber *, NSArray<NSNumber *> *> *EnrichedTextInputBlockingStyles(void) {
static NSDictionary<NSNumber *, NSArray<NSNumber *> *> *dict;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
dict = @{
@([BoldStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([ItalicStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([UnderlineStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([StrikethroughStyle getStyleType]): @[@([CodeBlockStyle getStyleType])],
@([InlineCodeStyle getStyleType]) : @[@([CodeBlockStyle getStyleType]), @([ImageStyle getStyleType])],
@([LinkStyle getStyleType]) : @[@([CodeBlockStyle getStyleType]), @([ImageStyle getStyleType])],
@([MentionStyle getStyleType]) : @[@([CodeBlockStyle getStyleType]), @([ImageStyle getStyleType])],
@([H1Style getStyleType]) : @[],
@([H2Style getStyleType]) : @[],
@([H3Style getStyleType]) : @[],
@([UnorderedListStyle getStyleType]): @[],
@([OrderedListStyle getStyleType]) : @[],
@([BlockQuoteStyle getStyleType]) : @[],
@([CodeBlockStyle getStyleType]) : @[],
@([ImageStyle getStyleType]) : @[@([InlineCodeStyle getStyleType])]
};
});
return dict;
}
58 changes: 4 additions & 54 deletions ios/EnrichedTextInputView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#import "LayoutManagerExtension.h"
#import "ZeroWidthSpaceUtils.h"
#import "ParagraphAttributesUtils.h"
#import "EnrichedTextInputStyles.h"

using namespace facebook::react;

Expand Down Expand Up @@ -80,60 +81,9 @@ - (void)setDefaults {

defaultTypingAttributes = [[NSMutableDictionary<NSAttributedStringKey, id> alloc] init];

stylesDict = @{
@([BoldStyle getStyleType]) : [[BoldStyle alloc] initWithInput:self],
@([ItalicStyle getStyleType]): [[ItalicStyle alloc] initWithInput:self],
@([UnderlineStyle getStyleType]): [[UnderlineStyle alloc] initWithInput:self],
@([StrikethroughStyle getStyleType]): [[StrikethroughStyle alloc] initWithInput:self],
@([InlineCodeStyle getStyleType]): [[InlineCodeStyle alloc] initWithInput:self],
@([LinkStyle getStyleType]): [[LinkStyle alloc] initWithInput:self],
@([MentionStyle getStyleType]): [[MentionStyle alloc] initWithInput:self],
@([H1Style getStyleType]): [[H1Style alloc] initWithInput:self],
@([H2Style getStyleType]): [[H2Style alloc] initWithInput:self],
@([H3Style getStyleType]): [[H3Style alloc] initWithInput:self],
@([UnorderedListStyle getStyleType]): [[UnorderedListStyle alloc] initWithInput:self],
@([OrderedListStyle getStyleType]): [[OrderedListStyle alloc] initWithInput:self],
@([BlockQuoteStyle getStyleType]): [[BlockQuoteStyle alloc] initWithInput:self],
@([CodeBlockStyle getStyleType]): [[CodeBlockStyle alloc] initWithInput:self],
@([ImageStyle getStyleType]): [[ImageStyle alloc] initWithInput:self]
};

conflictingStyles = @{
@([BoldStyle getStyleType]) : @[],
@([ItalicStyle getStyleType]) : @[],
@([UnderlineStyle getStyleType]) : @[],
@([StrikethroughStyle getStyleType]) : @[],
@([InlineCodeStyle getStyleType]) : @[@([LinkStyle getStyleType]), @([MentionStyle getStyleType])],
@([LinkStyle getStyleType]): @[@([InlineCodeStyle getStyleType]), @([LinkStyle getStyleType]), @([MentionStyle getStyleType])],
@([MentionStyle getStyleType]): @[@([InlineCodeStyle getStyleType]), @([LinkStyle getStyleType])],
@([H1Style getStyleType]): @[@([H2Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([H2Style getStyleType]): @[@([H1Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([H3Style getStyleType]): @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([UnorderedListStyle getStyleType]): @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([OrderedListStyle getStyleType]): @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([BlockQuoteStyle getStyleType]): @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([CodeBlockStyle getStyleType])],
@([CodeBlockStyle getStyleType]): @[@([H1Style getStyleType]), @([H2Style getStyleType]), @([H3Style getStyleType]),
@([BoldStyle getStyleType]), @([ItalicStyle getStyleType]), @([UnderlineStyle getStyleType]), @([StrikethroughStyle getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([InlineCodeStyle getStyleType]), @([MentionStyle getStyleType]), @([LinkStyle getStyleType])],
@([ImageStyle getStyleType]) : @[@([LinkStyle getStyleType]), @([MentionStyle getStyleType])]
};

blockingStyles = @{
@([BoldStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([ItalicStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([UnderlineStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([StrikethroughStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@([InlineCodeStyle getStyleType]) : @[@([CodeBlockStyle getStyleType]), @([ImageStyle getStyleType])],
@([LinkStyle getStyleType]): @[@([CodeBlockStyle getStyleType]), @([ImageStyle getStyleType])],
@([MentionStyle getStyleType]): @[@([CodeBlockStyle getStyleType]), @([ImageStyle getStyleType])],
@([H1Style getStyleType]): @[],
@([H2Style getStyleType]): @[],
@([H3Style getStyleType]): @[],
@([UnorderedListStyle getStyleType]): @[],
@([OrderedListStyle getStyleType]): @[],
@([BlockQuoteStyle getStyleType]): @[],
@([CodeBlockStyle getStyleType]): @[],
@([ImageStyle getStyleType]) : @[@([InlineCodeStyle getStyleType])]
};
stylesDict = EnrichedTextInputMakeStyles(self);
conflictingStyles = EnrichedTextInputConflictingStyles();
blockingStyles = EnrichedTextInputBlockingStyles();

parser = [[InputParser alloc] initWithInput:self];
}
Expand Down
Loading