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

feat: GutenbergKit code editor #21582

Merged
merged 6 commits into from
Jan 16, 2025
Merged

feat: GutenbergKit code editor #21582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5b6b24
feat: GutenbergKit text editor
dcalhoun Jan 14, 2025
19a6a64
refactor: Simplify HTML mode button visibility toggle
dcalhoun Jan 14, 2025
102d7ef
build: Update GutenbergKit ref
dcalhoun Jan 14, 2025
c30876f
docs: Add release note
dcalhoun Jan 14, 2025
acb9203
build: Update GutenbergKit ref
dcalhoun Jan 15, 2025
be0696d
build: Update GutenbergKit ref
dcalhoun Jan 16, 2025
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
25.7
-----
* [**] Send feedback from within the experimental editor "more" options menu. [#21586]
* [**] Support accessing the code editor within the experimental editor. [#21582]

25.6
-----
Expand Down
5 changes: 1 addition & 4 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,10 +1428,7 @@ class EditPostActivity : AppCompatActivity(), EditorFragmentActivity, EditorImag
}
previewMenuItem?.setVisible(showMenuItems)
if (viewHtmlModeMenuItem != null) {
viewHtmlModeMenuItem.setVisible(
(((editorFragment is AztecEditorFragment)
|| (editorFragment is GutenbergEditorFragment))) && showMenuItems
Comment on lines -1431 to -1433
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There does not appear to be a reason to check the editor fragment type, as this now applies to all editor types—Aztec, Gutenberg Mobile, and GutenbergKit.

)
viewHtmlModeMenuItem.isVisible = showMenuItems
viewHtmlModeMenuItem.setTitle(
if (htmlModeMenuStateOn) R.string.menu_visual_mode else R.string.menu_html_mode)
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ google-play-services-auth = '20.4.1'
google-services = '4.4.2'
gravatar = '2.2.0'
greenrobot-eventbus = '3.3.1'
gutenberg-kit = '55-a490cd3d2d70ad4bba501655f83fdc42b404d502'
gutenberg-kit = 'trunk-cc52214a50893b41898607ac0bff7f2787b085bb'
gutenberg-mobile = 'v1.121.0'
indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
jackson-databind = '2.12.7.1'
Expand Down
1 change: 1 addition & 0 deletions ...itor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergKitEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ private void toggleHtmlMode() {
mHtmlModeEnabled = !mHtmlModeEnabled;
mEditorFragmentListener.onTrackableEvent(TrackableEvent.HTML_BUTTON_TAPPED);
mEditorFragmentListener.onHtmlModeToggledInToolbar();
mGutenbergView.setTextEditorEnabled(mHtmlModeEnabled);
}

@Override
Expand Down
Loading