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

[Fix] Whitespace fix for editing text #26

Merged
merged 5 commits into from
Nov 8, 2024
Merged

[Fix] Whitespace fix for editing text #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ef74f9
remove clean whitespace from core atom, fix story
00salmon Nov 7, 2024
e29f585
add changeset
00salmon Nov 8, 2024
95b351f
prep for deploy
00salmon Nov 8, 2024
f1a384d
fix type error
00salmon Nov 8, 2024
f5ec32b
fix type import
00salmon Nov 8, 2024
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
5 changes: 5 additions & 0 deletions .changeset/twenty-walls-cough.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@raisins/react": patch
---

bump prosemirror package versions and remove global whitespace cleanup to prevent issues editing text nodes
488 changes: 282 additions & 206 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@
"jsonpointer": "^5.0.0",
"optics-ts": "^2.2.0",
"penpal": "^6.2.2",
"prosemirror-commands": "^1.1.11",
"prosemirror-keymap": "^1.1.4",
"prosemirror-schema-basic": "^1.1.2",
"prosemirror-state": "^1.3.4",
"prosemirror-view": "^1.20.2",
"prosemirror-commands": "^1.6.2",
"prosemirror-keymap": "^1.2.2",
"prosemirror-model": "^1.23.0",
"prosemirror-schema-basic": "^1.2.3",
"prosemirror-state": "^1.4.3",
"prosemirror-view": "^1.35.0",
"snabbdom": "^3.6.2",
"style-to-object": "^0.3.0",
"throttle-debounce": "^5.0.0",
Expand All @@ -90,11 +91,11 @@
"@testing-library/react": "^14.1.2",
"@types/css-tree": "^1.0.6",
"@types/jest": "^29.1.0",
"@types/prosemirror-commands": "^1.0.4",
"@types/prosemirror-keymap": "^1.0.4",
"@types/prosemirror-schema-basic": "^1.0.2",
"@types/prosemirror-state": "^1.2.7",
"@types/prosemirror-view": "^1.19.1",
"@types/prosemirror-commands": "^1.3.0",
"@types/prosemirror-keymap": "^1.2.0",
"@types/prosemirror-schema-basic": "^1.2.0",
"@types/prosemirror-state": "^1.4.0",
"@types/prosemirror-view": "^1.24.0",
"@types/react": "18",
"@types/react-dom": "^18.3.0",
"@types/resize-observer-browser": "^0.1.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/core/CoreAtoms.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const CoreMolecule = molecule((getMol, getScope) => {
if (ref.current?.html === html) {
return ref.current.node;
}
const parsedHtml = htmlParser(html, { cleanWhitespace: true });
const parsedHtml = htmlParser(html, { cleanWhitespace: false });

return parsedHtml;
},
Expand Down
2 changes: 0 additions & 2 deletions packages/react/src/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import { useHotkeys } from './hotkeys/useHotkeys';
import { NodeMolecule } from './node';
import { LayersController } from './node/slots/SlotChildrenController.stories';
import { SelectedNodeRichTextEditor } from './rich-text/SelectedNodeRichTextEditor';
import { StyleEditorController } from './stylesheets/StyleEditor';

const meta: Meta = {
title: 'Editor',
Expand Down Expand Up @@ -364,7 +363,6 @@ export function EditorView() {

<div style={Edits}>
<PackageEditor />
<StyleEditorController />
</div>
</div>
</>
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/rich-text/prosemirror/default-schema/DefaultProseSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const defaultMarkSpecs = DefaultTextMarks.filter((m) => m !== 'a').reduce(
const link = dom as HTMLElement;
const fromDom = component?.attributes?.reduce((attrs, attr) => {
return { ...attrs, [attr.name]: link.getAttribute(attr.name) };
}, {} as Record<string, string | null>);
}, {} as Record<string, string | null>) || {};
return fromDom;
},
},
Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/rich-text/prosemirror/default-schema/DefaultProseSchemaHotkeysPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
chainCommands,
Command,
createParagraphNear,
liftEmptyBlock,
newlineInCode,
Expand All @@ -9,7 +8,7 @@ import {
} from 'prosemirror-commands';
import {} from 'prosemirror-transform';
import { keymap } from 'prosemirror-keymap';
import { EditorState, Plugin, Transaction } from 'prosemirror-state';
import { Command, EditorState, Plugin, Transaction } from 'prosemirror-state';
import { DefaultProseSchema } from './DefaultProseSchema';

const cmd = (state: EditorState, dispatch?: (tr: Transaction) => void) => {
Expand Down
Loading