Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main'
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| diff --git a/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/PathView.java b/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/PathView.java | ||
| index 06829bd..1b15818 100644 | ||
| --- a/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/PathView.java | ||
| +++ b/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/PathView.java | ||
| @@ -14,17 +14,33 @@ import android.graphics.Paint; | ||
| import android.graphics.Path; | ||
| import com.facebook.react.bridge.ReactContext; | ||
|
|
||
| +import java.util.ArrayList; | ||
| +import java.util.HashMap; | ||
| + | ||
| +class ParsedPath { | ||
| + final Path path; | ||
| + final ArrayList<PathElement> elements; | ||
| + | ||
| + ParsedPath(Path path, ArrayList<PathElement> elements) { | ||
| + this.path = path; | ||
| + this.elements = elements; | ||
| + } | ||
| +} | ||
| + | ||
| @SuppressLint("ViewConstructor") | ||
| class PathView extends RenderableView { | ||
| private Path mPath; | ||
|
|
||
| + // This grows forever but for our use case (static icons) it's ok. | ||
| + private static final HashMap<String, ParsedPath> sPathCache = new HashMap<>(); | ||
| + | ||
| public PathView(ReactContext reactContext) { | ||
| super(reactContext); | ||
| PathParser.mScale = mScale; | ||
| mPath = new Path(); | ||
| } | ||
|
|
||
| - public void setD(String d) { | ||
| + void setDByParsing(String d) { | ||
| mPath = PathParser.parse(d); | ||
| elements = PathParser.elements; | ||
| for (PathElement elem : elements) { | ||
| @@ -33,6 +49,17 @@ class PathView extends RenderableView { | ||
| point.y *= mScale; | ||
| } | ||
| } | ||
| + } | ||
| + | ||
| + public void setD(String d) { | ||
| + ParsedPath cached = sPathCache.get(d); | ||
| + if (cached != null) { | ||
| + mPath = cached.path; | ||
| + elements = cached.elements; | ||
| + } else { | ||
| + setDByParsing(d); | ||
| + sPathCache.put(d, new ParsedPath(mPath, elements)); | ||
| + } | ||
| invalidate(); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| import React, {Children} from 'react' | ||
| import {TextProps as RNTextProps} from 'react-native' | ||
| import {StyleProp, TextStyle} from 'react-native' | ||
| import {UITextView} from 'react-native-uitextview' | ||
| import createEmojiRegex from 'emoji-regex' | ||
|
|
||
| import {isNative} from '#/platform/detection' | ||
| import {isIOS} from '#/platform/detection' | ||
| import {Alf, applyFonts, atoms, flatten} from '#/alf' | ||
|
|
||
| /** | ||
| * Util to calculate lineHeight from a text size atom and a leading atom | ||
| * | ||
| * Example: | ||
| * `leading(atoms.text_md, atoms.leading_normal)` // => 24 | ||
| */ | ||
| export function leading< | ||
| Size extends {fontSize?: number}, | ||
| Leading extends {lineHeight?: number}, | ||
| >(textSize: Size, leading: Leading) { | ||
| const size = textSize?.fontSize || atoms.text_md.fontSize | ||
| const lineHeight = leading?.lineHeight || atoms.leading_normal.lineHeight | ||
| return Math.round(size * lineHeight) | ||
| } | ||
|
|
||
| /** | ||
| * Ensures that `lineHeight` defaults to a relative value of `1`, or applies | ||
| * other relative leading atoms. | ||
| * | ||
| * If the `lineHeight` value is > 2, we assume it's an absolute value and | ||
| * returns it as-is. | ||
| */ | ||
| export function normalizeTextStyles( | ||
| styles: StyleProp<TextStyle>, | ||
| { | ||
| fontScale, | ||
| fontFamily, | ||
| }: { | ||
| fontScale: number | ||
| fontFamily: Alf['fonts']['family'] | ||
| } & Pick<Alf, 'flags'>, | ||
| ) { | ||
| const s = flatten(styles) | ||
| // should always be defined on these components | ||
| s.fontSize = (s.fontSize || atoms.text_md.fontSize) * fontScale | ||
|
|
||
| if (s?.lineHeight) { | ||
| if (s.lineHeight !== 0 && s.lineHeight <= 2) { | ||
| s.lineHeight = Math.round(s.fontSize * s.lineHeight) | ||
| } | ||
| } else if (!isNative) { | ||
| s.lineHeight = s.fontSize | ||
| } | ||
|
|
||
| applyFonts(s, fontFamily) | ||
|
|
||
| return s | ||
| } | ||
|
|
||
| export type StringChild = string | (string | null)[] | ||
| export type TextProps = RNTextProps & { | ||
| /** | ||
| * Lets the user select text, to use the native copy and paste functionality. | ||
| */ | ||
| selectable?: boolean | ||
| /** | ||
| * Provides `data-*` attributes to the underlying `UITextView` component on | ||
| * web only. | ||
| */ | ||
| dataSet?: Record<string, string | number | undefined> | ||
| /** | ||
| * Appears as a small tooltip on web hover. | ||
| */ | ||
| title?: string | ||
| /** | ||
| * Whether the children could possibly contain emoji. | ||
| */ | ||
| emoji?: boolean | ||
| } | ||
|
|
||
| const EMOJI = createEmojiRegex() | ||
|
|
||
| export function childHasEmoji(children: React.ReactNode) { | ||
| let hasEmoji = false | ||
| Children.forEach(children, child => { | ||
| if (typeof child === 'string' && createEmojiRegex().test(child)) { | ||
| hasEmoji = true | ||
| } | ||
| }) | ||
| return hasEmoji | ||
| } | ||
|
|
||
| export function renderChildrenWithEmoji( | ||
| children: React.ReactNode, | ||
| props: Omit<TextProps, 'children'> = {}, | ||
| emoji: boolean, | ||
| ) { | ||
| if (!isIOS || !emoji) { | ||
| return children | ||
| } | ||
| return Children.map(children, child => { | ||
| if (typeof child !== 'string') return child | ||
|
|
||
| const emojis = child.match(EMOJI) | ||
|
|
||
| if (emojis === null) { | ||
| return child | ||
| } | ||
|
|
||
| return child.split(EMOJI).map((stringPart, index) => [ | ||
| stringPart, | ||
| emojis[index] ? ( | ||
| <UITextView | ||
| {...props} | ||
| style={[props?.style, {color: 'black', fontFamily: 'System'}]}> | ||
| {emojis[index]} | ||
| </UITextView> | ||
| ) : null, | ||
| ]) | ||
| }) | ||
| } | ||
|
|
||
| const SINGLE_EMOJI_RE = /^[\p{Emoji_Presentation}\p{Extended_Pictographic}]+$/u | ||
| export function isOnlyEmoji(text: string) { | ||
| return text.length <= 15 && SINGLE_EMOJI_RE.test(text) | ||
| } | ||
Oops, something went wrong.