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.

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

Issue/1966 Disable whitespace collapse in Aztec #2127

Merged
merged 17 commits into from
Apr 24, 2020
Merged

Issue/1966 Disable whitespace collapse in Aztec #2127

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d0ac0cf
Update Aztec reference
SergioEstevao Apr 7, 2020
def50d0
Update GB reference
SergioEstevao Apr 7, 2020
18c66e1
Update GB reference.
SergioEstevao Apr 7, 2020
92825a7
Disable collapsing of whitespaces in aztec views.
SergioEstevao Apr 7, 2020
0952097
Update Aztec reference
SergioEstevao Apr 7, 2020
cb74137
Update GB reference.
SergioEstevao Apr 8, 2020
b88e9b2
Merge branch 'develop' into issue/1966_white_space_removal
SergioEstevao Apr 10, 2020
cd3d989
Point to android aztec PR which has changes related to whitespace ignore
marecar3 Apr 23, 2020
43e98e2
Update gb reference
marecar3 Apr 23, 2020
29b4c0e
Merge branch 'develop' into issue/1966_white_space_removal
marecar3 Apr 23, 2020
a034c37
Bump aztec version to v1.3.41
marecar3 Apr 23, 2020
d3390c2
Update GB reference.
SergioEstevao Apr 23, 2020
b2d3502
Update Aztec iOS to official 1.18.0 version.
SergioEstevao Apr 23, 2020
8d68f17
Update release notes.
SergioEstevao Apr 24, 2020
3f91bcc
Merge branch 'develop' into issue/1966_white_space_removal
SergioEstevao Apr 24, 2020
eb8e143
Merge branch 'develop' into issue/1966_white_space_removal
SergioEstevao Apr 24, 2020
f36064c
Update release notes.
SergioEstevao Apr 24, 2020
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
2 changes: 1 addition & 1 deletion gutenberg
Open in desktop
Submodule gutenberg updated 1 files
+4 −1 packages/rich-text/src/component/index.native.js
2 changes: 1 addition & 1 deletion ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ target 'gutenberg' do
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
pod 'RNTAztecView', :path => '../RNTAztecView.podspec'
#Use for testing non official versions of Aztec
#pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :commit => 'edf1c9ae758b946e76bb9de6efc9135d2c2a4b43'
pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :commit => '29dff741f4b19435d75f21179e27766337de8e9d'
pod 'Gutenberg', :path => '../Gutenberg.podspec'

target 'gutenbergTests' do
Expand Down
12 changes: 10 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ DEPENDENCIES:
- ReactNativeDarkMode (from `../node_modules/react-native-dark-mode`)
- RNSVG (from `../node_modules/react-native-svg`)
- RNTAztecView (from `../RNTAztecView.podspec`)
- WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git`, commit `29dff741f4b19435d75f21179e27766337de8e9d`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
trunk:
- boost-for-react-native
- WordPress-Aztec-iOS

EXTERNAL SOURCES:
BVLinearGradient:
Expand Down Expand Up @@ -356,9 +356,17 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-svg"
RNTAztecView:
:path: "../RNTAztecView.podspec"
WordPress-Aztec-iOS:
:commit: 29dff741f4b19435d75f21179e27766337de8e9d
:git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"

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

SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
BVLinearGradient: 60a475b2edfe7707deda00278cb8ce9bfe70e669
Expand Down Expand Up @@ -397,6 +405,6 @@ SPEC CHECKSUMS:
WordPress-Aztec-iOS: 319620514af963ca519bd83b96a2c0ebdf3a0f03
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b

PODFILE CHECKSUM: 7c7e4c82bf2c9ed08e515c352b72fc2d70b4ba48
PODFILE CHECKSUM: 8ff40c7ba0987a9efd0229fb249ca94bfd0418b5

COCOAPODS: 1.8.4
1 change: 1 addition & 0 deletions react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class RCTAztecView: Aztec.TextView {
addPlaceholder()
textDragInteraction?.isEnabled = false
storage.htmlConverter.characterToReplaceLastEmptyLine = Character(.zeroWidthSpace)
storage.htmlConverter.shouldCollapseSpaces = false
shouldNotifyOfNonUserChanges = false
disableLinkTapRecognizer()
preBackgroundColor = .clear
Expand Down