@kanaabe => Text component / Paragraph updates #1222
Merged
Conversation
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
Contributor
eessex
commented
Aug 14, 2017
•
eessex
commented
- Adds Reaction Text component to Text Section
- Change import style for Draft imports
- Replace 'rich_text2/input_paragraph' with 'rich_text2/paragraph' (will also replace rich_text_caption in a separate PR)
- Changes sectionContainer to mimic Reaction component naming
- Kills handleBackspace error
eessex
force-pushed
the
more-text
branch
2 times, most recently
from
0546c1c to
1045cad
Compare
eessex
changed the title
kanaabe
reviewed
Aug 18, 2017
| Embed = React.createFactory require '../../content/sections/embed/index.coffee' | ||
| Fullscreen = React.createFactory require '../../content/sections/fullscreen/index.coffee' | ||
| ImageCollection = React.createFactory require '../sections/image_collection/index.coffee' | ||
| Image = React.createFactory require '../../content/sections/image/index.coffee' |
kanaabe
reviewed
Aug 18, 2017
| Nav = React.createFactory require '../../../../../../components/rich_text2/components/nav.coffee' | ||
| InputUrl = React.createFactory require '../../../../../../components/rich_text2/components/input_url.coffee' | ||
| Text = React.createFactory components.Text | ||
| Utils = require '../../../../../../components/rich_text2/utils/index.coffee' |
kanaabe
reviewed
Aug 18, 2017
| margin-right 10px | ||
| margin-top .298em | ||
| text-transform uppercase | ||
|
|
kanaabe
reviewed
Aug 18, 2017
package.json
Outdated
| @@ -14,7 +14,7 @@ | |||
| "deploy": "sh scripts/deploy.sh" | |||
| }, | |||
| "dependencies": { | |||
| "@artsy/reaction-force": "^0.1.49", | |||
| "@artsy/reaction-force": "^0.3.1", | |||
There was a problem hiding this comment.
Not sure if you want to include any of the latest Reaction work here, but I imagine we should be at a 0.4.0 now if you want it.
There was a problem hiding this comment.
Ah cool, yeah definitely want the latest
There was a problem hiding this comment.
I'm going to go ahead and deploy reaction -- is still on 3.1, do i jump right to v4.0?
kanaabe
reviewed
Aug 18, 2017
| @@ -93,7 +93,7 @@ module.exports = React.createClass | |||
| selection = Utils.getSelectionDetails(@state.editorState) | |||
| # only merge a section if cursor is in first character of first block | |||
| if selection.isFirstBlock and selection.anchorOffset is 0 and | |||
| @props.sections.models[@props.index - 1].get('type') is 'text' | |||
| @props.sections.models[@props.index - 1]?.get('type') is 'text' | |||
There was a problem hiding this comment.
Check out .at(@props.index -1)
|
I can't merge because of the conflict, but this is ready otherwise. Nice job refactoring the text component to use Reaction! It's a very ideal outcome :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.