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

Use prosemirror-editor #500

Merged
merged 8 commits into from
Nov 17, 2023
Merged

Use prosemirror-editor #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e9b135d
Start adding styles for new editor
rhystmills Sep 15, 2023
fdee5c3
start adding prosemirror editor
rhystmills Sep 15, 2023
b09daa7
Add .yalc to gitignore to remove noise locally
rhystmills Oct 18, 2023
9d13416
Get rich text editor working for tag description
rhystmills Oct 19, 2023
57b4bea
.gitignore more things
rhystmills Oct 20, 2023
9605a4d
Remove scribe editor and related dependencies
rhystmills Oct 20, 2023
9857cab
Merge branch 'main' into rm/prosemirror-editor
rhystmills Nov 14, 2023
fcdc235
Bump prosemirror-editor to 0.2.0 to include editor disable feature
rhystmills Nov 15, 2023
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ npm-debug.log
.bsp
.metals
.vscode
.yalc
yalc.lock
.bloop
metals.sbt
207 changes: 147 additions & 60 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"client-dev": "node ./public/devserver.js"
},
"dependencies": {
"@guardian/prosemirror-editor": "^0.2.0",
"ajv": "^6.12.3",
"babel-loader": "^8.2.5",
"css-loader": "^3.6.0",
Expand Down Expand Up @@ -37,11 +38,6 @@
"reqwest": "^2.0.5",
"sass": "^1.55.0",
"sass-loader": "^8.0.2",
"scribe-editor": "^2.1.1",
"scribe-plugin-keyboard-shortcuts": "^0.1.1",
"scribe-plugin-link-prompt-command": "^0.4.0",
"scribe-plugin-sanitizer": "^0.1.10",
"scribe-plugin-toolbar": "^0.2.2",
"style-loader": "^2.0.0",
"svg-sprite": "^2.0.2",
"url-loader": "^0.5.7",
Expand Down
1 change: 1 addition & 0 deletions public/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {setStore} from './util/storeAccessor';
import {router} from './router';

import './style/main.scss';
import '@guardian/prosemirror-editor/dist/style.css'

function extractConfigFromPage() {

Expand Down
19 changes: 11 additions & 8 deletions public/components/TagEdit/formComponents/TagDescription.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import React from 'react';
import ReactScribe from '../../utils/ReactScribe.react';
import { RichTextEditor, customMultiBlockTextConfig, transformToLegacyMarkup } from '@guardian/prosemirror-editor';


const config = customMultiBlockTextConfig({
allowedNodes: ["text", "paragraph", "hard_break"],
allowedMarks: ["strong", "em", "link"]
})

export default class TagDescription extends React.Component {

Expand All @@ -9,7 +15,7 @@ export default class TagDescription extends React.Component {

updateDescription(html) {
this.props.updateTag(Object.assign({}, this.props.tag, {
description: html
description: transformToLegacyMarkup(html)
}));
}

Expand All @@ -22,13 +28,10 @@ export default class TagDescription extends React.Component {
<div className="tag-edit__input-group">
<label className="tag-edit__input-group__header">Description/Profile</label>
<div>
<ReactScribe
onChange={this.updateDescription.bind(this)}
<RichTextEditor
value={this.props.tag.description || ''}
className="tag-edit__richtext"
toolbarClassName="tag-edit__richtext__toolbar"
toolbarItemClassName="tag-edit__richtext__toolbar__item"
editorClassName="tag-edit__richtext__editor"
onUpdate={this.updateDescription.bind(this)}
config={config}
disabled={!this.props.tagEditable}
/>
</div>
Expand Down
Loading