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

Jump to bottom

[RNMobile] Support Theme Colors and Gradients #22197

Merged
merged 15 commits into from
Jun 3, 2020
Merged

[RNMobile] Support Theme Colors and Gradients #22197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d5124b7
Expose editor theme colors to editor settings from parent apps
chipsnyder Apr 3, 2020
5422d3a
Fix style issues
chipsnyder Apr 3, 2020
4ef6a76
Added support for updating theme color asynchronously
chipsnyder Apr 6, 2020
8b6e19c
Merge remote-tracking branch 'origin/master' into rnmobile/issue/1744…
chipsnyder Apr 20, 2020
50edb89
Merge remote-tracking branch 'origin/master' into rnmobile/issue/1744…
chipsnyder May 5, 2020
08bca9b
Add support for custom gradients
chipsnyder May 7, 2020
f15f249
Add mocks to gutenberg bridge for tests
chipsnyder May 8, 2020
7e37b7a
Modify button to support theme gradients
chipsnyder May 8, 2020
b8d4181
Fix format issue
chipsnyder May 8, 2020
c4ab133
Adjust color picker to pull from settings instead of the default colors
chipsnyder May 11, 2020
324c9a4
Merge commit 'b4eba9a8e7e571d835da66e6372655b4e5af9369' into rnmobile…
chipsnyder May 11, 2020
d20665e
Refactor to simplify the call to settings
chipsnyder May 11, 2020
d7c35b5
Merge remote-tracking branch 'origin/master' into rnmobile/issue/1744…
chipsnyder May 11, 2020
d398071
Merge branch 'master' into rnmobile/issue/1744-themeColors
chipsnyder May 20, 2020
b3d78e4
Merge remote-tracking branch 'origin/master' into rnmobile/issue/1744…
chipsnyder Jun 3, 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
Prev Previous commit
Next Next commit
Add support for custom gradients
  • Loading branch information
@chipsnyder
chipsnyder committed May 7, 2020
commit 08bca9bab8d8cc7d5af87d69322ef2fe68accd19
11 changes: 9 additions & 2 deletions packages/edit-post/src/editor.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class Editor extends Component {
focusMode,
hiddenBlockTypes,
blockTypes,
colors
colors,
gradients
) {
settings = {
...settings,
Expand Down Expand Up @@ -70,6 +71,10 @@ class Editor extends Component {
settings.colors = colors;
}

if ( gradients !== undefined ) {
settings.gradients = gradients;
}

return settings;
}

Expand Down Expand Up @@ -104,6 +109,7 @@ class Editor extends Component {
post,
postType,
colors,
gradients,
...props
} = this.props;

Expand All @@ -113,7 +119,8 @@ class Editor extends Component {
focusMode,
hiddenBlockTypes,
blockTypes,
colors
colors,
gradients
);

const normalizedPost = post || {
Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/components/provider/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ class NativeEditorProvider extends Component {
);

this.subscriptionParentUpdateTheme = subscribeUpdateTheme(
( colors ) => {
this.props.updateSettings( { colors } );
( theme ) => {
this.props.updateSettings( theme );
}
);
}
Expand Down