Page MenuHomePhorge
Files F32209503

D15019.1765126550.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D15019.1765126550.diff
View Options

diff --git a/native/chat/mention-typeahead-tooltip-button.react.js b/native/chat/mention-typeahead-tooltip-button.react.js
--- a/native/chat/mention-typeahead-tooltip-button.react.js
+++ b/native/chat/mention-typeahead-tooltip-button.react.js
@@ -57,7 +57,7 @@
color: 'typeaheadTooltipText',
},
buttonLabel: {
- color: 'white',
+ color: 'typeaheadTooltipText',
fontSize: 16,
fontWeight: '400',
marginLeft: 8,
diff --git a/native/markdown/styles.js b/native/markdown/styles.js
--- a/native/markdown/styles.js
+++ b/native/markdown/styles.js
@@ -95,13 +95,13 @@
insideListView: {
flexShrink: 1,
},
-};
+} as const;
export type MarkdownStyles = typeof unboundStyles;
const getMarkdownStyles: GlobalTheme => MarkdownStyles = _memoize(
(theme: GlobalTheme) => {
- return getStylesForTheme(unboundStyles, theme);
+ return getStylesForTheme({ ...unboundStyles }, theme);
},
);
diff --git a/native/themes/colors.js b/native/themes/colors.js
--- a/native/themes/colors.js
+++ b/native/themes/colors.js
@@ -52,7 +52,116 @@
spoilerColor: '#33332c',
});
-const light = Object.freeze({
+export type Colors = $ReadOnly<{
+ blockQuoteBackground: string,
+ blockQuoteBorder: string,
+ codeBackground: string,
+ disabledButton: string,
+ disabledButtonText: string,
+ disconnectedBarBackground: string,
+ editButton: string,
+ floatingButtonBackground: string,
+ floatingButtonLabel: string,
+ headerChevron: string,
+ inlineEngagementBackground: string,
+ inlineEngagementLabel: string,
+ link: string,
+ listBackground: string,
+ listBackgroundLabel: string,
+ listBackgroundSecondaryLabel: string,
+ listBackgroundTernaryLabel: string,
+ listChatBubble: string,
+ listForegroundLabel: string,
+ listForegroundSecondaryLabel: string,
+ listForegroundTertiaryLabel: string,
+ listInputBackground: string,
+ listInputBar: string,
+ listInputButton: string,
+ listIosHighlightUnderlay: string,
+ listSearchBackground: string,
+ listSearchIcon: string,
+ listSeparatorLabel: string,
+ modalBackground: string,
+ modalBackgroundLabel: string,
+ modalBackgroundSecondaryLabel: string,
+ modalButton: string,
+ modalButtonLabel: string,
+ modalContrastBackground: string,
+ modalContrastForegroundLabel: string,
+ modalContrastOpacity: number,
+ modalForeground: string,
+ modalForegroundBorder: string,
+ modalForegroundLabel: string,
+ modalForegroundSecondaryLabel: string,
+ modalForegroundTertiaryLabel: string,
+ modalIosHighlightUnderlay: string,
+ modalSubtext: string,
+ modalSubtextLabel: string,
+ modalInputBackground: string,
+ modalInputForeground: string,
+ modalKnob: string,
+ modalAccentBackground: string,
+ navigationCard: string,
+ navigationChevron: string,
+ panelBackground: string,
+ panelBackgroundLabel: string,
+ panelButton: string,
+ panelForeground: string,
+ panelForegroundBorder: string,
+ panelForegroundLabel: string,
+ panelForegroundIcon: string,
+ panelForegroundSecondaryLabel: string,
+ panelForegroundTertiaryLabel: string,
+ panelInputBackground: string,
+ panelInputSecondaryForeground: string,
+ panelIosHighlightUnderlay: string,
+ panelSecondaryForeground: string,
+ panelSecondaryForegroundBorder: string,
+ panelSeparator: string,
+ purpleLink: string,
+ purpleButton: string,
+ primaryButtonToggled: string,
+ primaryButtonText: string,
+ reactionSelectionPopoverItemBackground: string,
+ redText: string,
+ spoiler: string,
+ tabBarAccent: string,
+ tabBarBackground: string,
+ tabBarActiveTintColor: string,
+ vibrantGreenButton: string,
+ vibrantRedButton: string,
+ whiteText: string,
+ tooltipBackground: string,
+ logInSpacer: string,
+ siweButton: string,
+ siweButtonText: string,
+ drawerExpandButton: string,
+ drawerExpandButtonDisabled: string,
+ drawerItemLabelLevel0: string,
+ drawerItemLabelLevel1: string,
+ drawerItemLabelLevel2: string,
+ drawerOpenCommunityBackground: string,
+ drawerBackground: string,
+ subthreadsModalClose: string,
+ subthreadsModalBackground: string,
+ subthreadsModalSearch: string,
+ typeaheadTooltipBackground: string,
+ typeaheadTooltipBorder: string,
+ typeaheadTooltipText: string,
+ messageLabel: string,
+ modalSeparator: string,
+ secondaryButtonBorder: string,
+ inviteLinkLinkColor: string,
+ inviteLinkButtonBackground: string,
+ greenIndicatorInner: string,
+ greenIndicatorOuter: string,
+ redIndicatorInner: string,
+ redIndicatorOuter: string,
+ deletedMessageText: string,
+ deletedMessageBackground: string,
+}>;
+
+const light: Colors = Object.freeze({
blockQuoteBackground: designSystemColors.shadesWhite70,
blockQuoteBorder: designSystemColors.shadesWhite60,
codeBackground: designSystemColors.shadesWhite70,
@@ -145,6 +254,9 @@
subthreadsModalClose: designSystemColors.shadesBlack50,
subthreadsModalBackground: designSystemColors.shadesWhite80,
subthreadsModalSearch: '#00000008',
+ typeaheadTooltipBackground: designSystemColors.shadesWhite70,
+ typeaheadTooltipBorder: designSystemColors.shadesWhite60,
+ typeaheadTooltipText: designSystemColors.shadesBlack95,
messageLabel: designSystemColors.shadesBlack95,
modalSeparator: designSystemColors.shadesWhite60,
secondaryButtonBorder: designSystemColors.shadesWhite100,
@@ -157,7 +269,6 @@
deletedMessageText: designSystemColors.shadesBlack60,
deletedMessageBackground: designSystemColors.shadesWhite90,
});
-export type Colors = $Exact<typeof light>;
const dark: Colors = Object.freeze({
blockQuoteBackground: '#A9A9A9',
@@ -284,7 +395,7 @@
}
}
-type Styles = { [name: string]: { [field: string]: mixed } };
+type Styles = { [name: string]: { +[field: string]: mixed } };
export type StyleSheetOf<S: Styles> = $ReadOnly<{ [$Keys<S>]: any }>;
@@ -302,6 +413,7 @@
continue;
}
if (magicStrings.has(styleValue)) {
+ // $FlowIgnore[invalid-computed-prop]
const mapped = themeColors[styleValue];
if (mapped) {
filledInStyle[styleKey] = mapped;
@@ -310,6 +422,7 @@
}
result[key] = filledInStyle;
}
+ // $FlowIgnore[incompatible-call]
return StyleSheet.create(result);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 4:55 PM (19 h, 23 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841998
Default Alt Text
D15019.1765126550.diff (6 KB)

Event Timeline