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

Inline text formatting #1323

Merged
merged 63 commits into from May 6, 2020
Merged

Inline text formatting #1323

merged 63 commits into from May 6, 2020

Commits on Apr 23, 2020

  1. WIP: First partially working version of inline text formatting

    Morten Barklund committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    536ac78 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    2e023e8 View commit details
    Browse the repository at this point in the history

  3. Added fix for importing elements with multiple styles

    Morten Barklund committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    854510f View commit details
    Browse the repository at this point in the history

  4. Added the option to toggle b/i/u for entire text field

    Morten Barklund committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    6fdac4c View commit details
    Browse the repository at this point in the history

  5. Cleaned up the structure a bit

    Morten Barklund committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    e0506bf View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. Added support for font weight and multi-select

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    323ec6c View commit details
    Browse the repository at this point in the history

  2. Update tests now that some values are not in use

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    6377f5a View commit details
    Browse the repository at this point in the history

  3. Adding npx to postinstall to see if CI approves

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    48c765d View commit details
    Browse the repository at this point in the history

  4. Removed postinstall-postinstall

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    b0ba301 View commit details
    Browse the repository at this point in the history

  5. If selection is collapsed when applying style change, apply to inline… 

    … override
    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    1656c0a View commit details
    Browse the repository at this point in the history

  6. Reorganised selection manip and added letter spacing

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    ad34f87 View commit details
    Browse the repository at this point in the history

  7. Disable force focus when setting letter spacing 

    Actually the whole `forceFocus` variable was superfluous - `EditorState.forceSelection` autimatically forces focus to the editor. And selection was remembered, just not visible while unfocused, so things still work as expected.
    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    4a28da7 View commit details
    Browse the repository at this point in the history

  8. Added inline text color formatting

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    6346fa2 View commit details
    Browse the repository at this point in the history

  9. Fix multiple reducer for patterns, and fix tests

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    ebf8f26 View commit details
    Browse the repository at this point in the history

  10. Fixed font and font weight dropdowns 

    Font weight dropdown simply gets a new placeholder, as the placeholder will only be shown, when there's multiple font weights selected.

For now, font weight logic is removed from font selector (but must be readded in a new version later), and tests are updated.
    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    04af4f5 View commit details
    Browse the repository at this point in the history

  11. Remove deprecated types from text element

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    e17c4f6 View commit details
    Browse the repository at this point in the history

  12. Some extra cleanup of deprecated properties

    Morten Barklund committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    47df628 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Added new migration with test (also added jest-extended)

    Morten Barklund committed Apr 27, 2020
    2 Configuration menu
    Copy the full SHA
    5dcaf4e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    0f49ebd View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    e8b1f4e View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. Refactored formatters to verticals rather than horizontals - much cle… 

    …aner result
    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    9739dfb View commit details
    Browse the repository at this point in the history

  2. Fixed reducer and added comments

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    41e6954 View commit details
    Browse the repository at this point in the history

  3. Added jsdocs to html manipulation

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    97a91cf View commit details
    Browse the repository at this point in the history

  4. Removed classes from migration and added test for nested tags

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    c4f4c18 View commit details
    Browse the repository at this point in the history

  5. Fix tests for text style now that export does not have classes anymore

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    057f33c View commit details
    Browse the repository at this point in the history

  6. Moved focus management to edit component

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    8097c3f View commit details
    Browse the repository at this point in the history

  7. Create general getValidHTML util

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    8685d11 View commit details
    Browse the repository at this point in the history

  8. Added deps to useImperativeHandle

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    3a80904 View commit details
    Browse the repository at this point in the history

  9. Fixed parseFloat args

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    e2d2f23 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    4f58366 View commit details
    Browse the repository at this point in the history

  11. Added faux-selection style and fixed various bugs

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    a0b3259 View commit details
    Browse the repository at this point in the history

  12. Fixed typo

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    59134bc View commit details
    Browse the repository at this point in the history

  13. For now, strip formatting when pasting

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    ab85df5 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    37c9433 View commit details
    Browse the repository at this point in the history

  15. Remove weird npm scripts

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    2f09bc6 View commit details
    Browse the repository at this point in the history

  16. Using a less nice matcher

    Morten Barklund committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    7e2ed36 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Added tests for formatters

    Morten Barklund committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    102c5af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    4f88010 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    aa2fff6 View commit details
    Browse the repository at this point in the history

  4. Set default font color to black - all other colors are fixed inline

    Morten Barklund committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    44d7a77 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Added unit tests for style manipulation 

    These are slightly integrated with draft-js' editor state, as it was too complex too mock and this is actually a better test IMHO.
    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    b5a0c76 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    080251b View commit details
    Browse the repository at this point in the history

  3. Fixed color input (allow multiple value string)

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    85edb58 View commit details
    Browse the repository at this point in the history

  4. Fixed color picker to default to solid black (rather than transparent… 

    … black)
    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    e8f6266 View commit details
    Browse the repository at this point in the history

  5. Fixed null value for input

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    f1dcb73 View commit details
    Browse the repository at this point in the history

  6. Fix color preset to work for new ITF formatting

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    03aa64b View commit details
    Browse the repository at this point in the history

  7. Added full support for text color and text style presets

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    1b4f9de View commit details
    Browse the repository at this point in the history

  8. Inlined font weights for text panel presets

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    f0dd127 View commit details
    Browse the repository at this point in the history

  9. Fix focus out to check click target in capture phase

    Morten Barklund committed May 1, 2020
    Configuration menu
    Copy the full SHA
    d411b08 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Merge branch 'master' into feature/inline-rich-text 

    # Conflicts:
#	assets/src/edit-story/migration/migrate.js
#	package.json
    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    f1c8468 View commit details
    Browse the repository at this point in the history

  2. Re-add default props to test

    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    16dbf27 View commit details
    Browse the repository at this point in the history

  3. Added jsdoc for draftUtils

    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    e295b37 View commit details
    Browse the repository at this point in the history

  4. Fix children proptype

    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    870f2bd View commit details
    Browse the repository at this point in the history

  5. Add better error handlign to faux selection removal

    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    e03baf3 View commit details
    Browse the repository at this point in the history

  6. Added jsdocs for complex style manipulation functions

    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    0081a79 View commit details
    Browse the repository at this point in the history

  7. Added function to strip relevant inline styling

    Morten Barklund committed May 4, 2020
    Configuration menu
    Copy the full SHA
    c5adfec View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. Merge branch 'master' into feature/inline-rich-text 

    # Conflicts:
#	package.json
    Morten Barklund committed May 5, 2020
    Configuration menu
    Copy the full SHA
    cd77cb9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed May 5, 2020
    Configuration menu
    Copy the full SHA
    7a28375 View commit details
    Browse the repository at this point in the history

  3. Added new function to compare patterns and used where applicable

    Morten Barklund committed May 5, 2020
    Configuration menu
    Copy the full SHA
    ba711d7 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Added ignore black to set color style as it is default

    Morten Barklund committed May 6, 2020
    Configuration menu
    Copy the full SHA
    b63842a View commit details
    Browse the repository at this point in the history

  2. Changed highlight to use existing style manipulation 

    Reverted changes to `getValidHTML` and reused the existing HTML manipulation functions.
    Morten Barklund committed May 6, 2020
    2 Configuration menu
    Copy the full SHA
    b6468b0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/inline-rich-text

    Morten Barklund committed May 6, 2020
    Configuration menu
    Copy the full SHA
    595d4dd View commit details
    Browse the repository at this point in the history

  4. Removed conditional hook

    Morten Barklund committed May 6, 2020
    Configuration menu
    Copy the full SHA
    13b6fda View commit details
    Browse the repository at this point in the history