Skip to content
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.

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

[Mobile] Highlight color fixes #57650

Merged
merged 31 commits into from
Mar 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fb7f568
Fix resetting the color
Jan 8, 2024
1e066b1
Temp: Update Aztec reference
Jan 8, 2024
f4ee1d1
Temp: Update Aztec reference
Jan 8, 2024
0ab9509
RichText remove mark as activeFormats
Jan 12, 2024
25c8fec
TextColor use getActiveColors from the native variant
Jan 12, 2024
2a270aa
TextColor - Refactor manual logic to apply the Mark formatting and no…
Jan 12, 2024
0a88e7b
AztecView, don't call toggleMark when activeFormats changes
Jan 12, 2024
2f94e40
Add iOS native methods to set the mark formatting and to remove it
Jan 12, 2024
b21fa81
Merge branch 'trunk' into fix/ios-highlight-text-functionality
Jan 12, 2024
7ab4120
Update Aztec ref
Jan 12, 2024
9fd8150
Merge branch 'trunk' into fix/ios-highlight-text-functionality
Jan 17, 2024
031207c
Add text-color formatting in activeFormats
Jan 19, 2024
d5564a6
Handle onMarkFormatting on the Android side as well
Jan 19, 2024
19c09da
Removes highlight text test when there's no selection since this is m…
Jan 19, 2024
0dc3f95
Merge branch 'trunk' into fix/ios-highlight-text-functionality
Jan 19, 2024
05d67ae
Update Aztec ref
Jan 19, 2024
c644e9a
Update Aztec ref
Jan 19, 2024
ef3a25e
Fix onMarkFormatting logic
Jan 22, 2024
4c545f6
Update Aztec version
Jan 22, 2024
3958f69
Palette screen - Add accessibility label
Jan 22, 2024
d8c6e5a
E2E Helpers - Adds typeKeyString and toggleHighlightColor
Jan 22, 2024
207d93b
Update Aztec ref
Jan 23, 2024
620ced0
Bring back calling toggleMark when activeFormats is set for the Mark …
Jan 24, 2024
950c8c5
Merge branch 'trunk' into fix/ios-highlight-text-functionality
Mar 7, 2024
93b6ea6
Update Changelog
Mar 7, 2024
b9697d5
Update Podfile
Mar 7, 2024
16c9aea
Merge branch 'trunk' into fix/ios-highlight-text-functionality
Mar 18, 2024
99b9fad
Update Podfile.lock
Mar 18, 2024
8bf9e20
getFormatColors - Fix appending undefined values
Mar 18, 2024
40ce1d8
Update Aztec version
Mar 21, 2024
ccdb629
Update Aztec to 1.19.11
Mar 21, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'trunk' into fix/ios-highlight-text-functionality
# Conflicts:
#	packages/react-native-editor/CHANGELOG.md
#	packages/react-native-editor/ios/Podfile.lock
Gerardo committed Mar 18, 2024
commit 16c9aea64055a68544dbcb1708695cd45391ffa1
8 changes: 7 additions & 1 deletion packages/react-native-editor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -10,12 +10,18 @@ For each user feature we should also add a importance categorization label to i
-->

## Unreleased
- [**] Highlight color formatting style improvements [#57650]

## 1.115.0
- [*] Improve consistency of the block outline indicating the currently selected block [#59415]
- [*] Gallery block items with in-progress, paused, or failed media uploads correctly display an highlight outline when selected [#59423]
- [**] [internal] Upgrade React Native to version 0.73.3 [#58475]
- [**] Highlight color formatting style improvements [#57650]
- [**] Add error boundary components and exception logging [#59221]
- [**] Fix crash occurring when the URL associated with a Video block is changed too quickly [#59841]
- [**] Enable setting HTML anchor IDs for all supported block types [#59802]

## 1.114.1
- [**] Fix a crash produced when the content of a synced pattern is updated [#59632]

## 1.114.0
- [*] Prevent crash when autoscrolling to blocks [#59110]
14 changes: 3 additions & 11 deletions packages/react-native-editor/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1190,7 +1190,6 @@ DEPENDENCIES:
- RNScreens (from `../../../node_modules/react-native-screens`)
- RNSVG (from `../../../node_modules/react-native-svg`)
- RNTAztecView (from `../../react-native-aztec`)
- WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git`, commit `a41d881f6a831fecef9e6400e69a64aafe80d9ac`)
- Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
@@ -1201,6 +1200,7 @@ SPEC REPOS:
- SDWebImage
- SDWebImageWebPCoder
- SocketRocket
- WordPress-Aztec-iOS

EXTERNAL SOURCES:
boost:
@@ -1332,17 +1332,9 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/react-native-svg"
RNTAztecView:
:path: "../../react-native-aztec"
WordPress-Aztec-iOS:
:commit: a41d881f6a831fecef9e6400e69a64aafe80d9ac
:git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git
Yoga:
:path: "../../../node_modules/react-native/ReactCommon/yoga"

CHECKOUT OPTIONS:
WordPress-Aztec-iOS:
:commit: a41d881f6a831fecef9e6400e69a64aafe80d9ac
:git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git

SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
BVLinearGradient: fbe308a1d19a8133f69e033abc85d8008644f5e3
@@ -1351,7 +1343,7 @@ SPEC CHECKSUMS:
FBReactNativeSpec: 73b3972e2bd20b3235ff2014f06a3d3af675ed29
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
Gutenberg: 76d20cd7f0489c9e73d94616eb59593560a04941
Gutenberg: 063e73c87f712ec62233eb93c12f1ab54adcc880
hermes-engine: 5420539d016f368cd27e008f65f777abd6098c56
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
@@ -1417,6 +1409,6 @@ SPEC CHECKSUMS:
WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
Yoga: ff0382b894475dba0b4d2a5fda860bfee5a9afad

PODFILE CHECKSUM: ea6b5fb1749cb8bf26e491208aff7b540d63776e
PODFILE CHECKSUM: 4684cf41ccdeb5f720da9f11c8904f21ad9fcc7f

COCOAPODS: 1.14.3
You are viewing a condensed version of this merge commit. You can view the full changes here.