Skip to content
Snippets Groups Projects
Commit 4627e3af authored by chris's avatar chris
Browse files

fix yarn and cleanup

parent 1c58bde6
No related branches found
No related tags found
1 merge request!600Application context provider
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 378 additions and 163 deletions
.nvmrc
+ 1
− 1
View file @ 4627e3af
14.15.5
16.19.1
editors/demo/package.json
+ 2
− 1
View file @ 4627e3af
......@@ -35,7 +35,8 @@
"not op_mini all"
],
"resolutions": {
"styled-components": "5.3.1"
"styled-components": "5.3.1",
"prosemirror-transform": "1.7.1"
},
"devDependencies": {
"babel-eslint": "10.0.3",
......
wax-prosemirror-core/src/Wax.js
+ 0
− 30
View file @ 4627e3af
......@@ -77,7 +77,6 @@ const Wax = forwardRef((props, innerViewRef) => {
return (
<ApplicationProvider app={application}>
<<<<<<< HEAD
<WaxProvider>
<PortalProvider>
<WaxLayout
......@@ -105,35 +104,6 @@ const Wax = forwardRef((props, innerViewRef) => {
/>
</PortalProvider>
</WaxProvider>
=======
<WaxProvider>
<PortalProvider>
<WaxLayout
app={application}
autoFocus={autoFocus}
browserSpellCheck={browserSpellCheck}
className={className}
customValues={customValues}
fileUpload={fileUpload}
innerViewRef={innerViewRef}
onChange={finalOnChange || (() => true)}
placeholder={placeholder}
readonly={readonly}
scrollMargin={scrollMargin}
scrollThreshold={scrollThreshold}
serializer={serializer}
targetFormat={targetFormat}
TrackChange={
application.config.get('config.EnableTrackChangeService') ||
undefined
}
user={user}
value={value}
{...props}
/>
</PortalProvider>
</WaxProvider>
>>>>>>> fix(components): fix(core): application context
</ApplicationProvider>
);
});
......
wax-prosemirror-core/src/WaxContext.js
+ 0
− 12
View file @ 4627e3af
......@@ -40,18 +40,6 @@ export default props => {
activeViewId: newActiveViewId,
};
});
// const pmViews = { ...context.pmViews, ...newView };
// const activeView = pmViews[activeViewId || context.activeViewId];
// // const pmViews = Object.assign(context.pmViews, newView);
// // const activeView = pmViews[activeViewId || context.activeViewId];
// setContext({
// ...context,
// pmViews,
// activeView,
// activeViewId: activeViewId || context.activeViewId,
// });
},
setTransaction: tr => {
Object.assign(context.transaction, tr);
......
wax-prosemirror-core/src/WaxView.js
+ 0
− 1
View file @ 4627e3af
......@@ -24,7 +24,6 @@ const WaxView = props => {
const initialize = useCallback(() => {
if (divRef.current) {
console.log('reinitialize')
divRef.current.replaceChildren(main?.dom);
}
}, [main]);
......
wax-prosemirror-core/src/useWaxView.js
+ 100
− 99
View file @ 4627e3af
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable react/prop-types */
import React, { useEffect, useState, forwardRef } from 'react';
import { DOMSerializer } from 'prosemirror-model';
import CryptoJS from 'crypto-js';
import stringify from 'safe-stable-stringify';
import DefaultSchema from './utilities/schema/DefaultSchema';
import WaxProvider from './WaxContext';
import PortalProvider from './PortalContext';
import ApplicationProvider from './ApplicationContext';
import Application from './Application';
/* eslint-disable import/no-named-as-default */
import { useContext, useEffect, useImperativeHandle, useState } from 'react';
import { EditorState } from 'prosemirror-state';
import { EditorView } from 'prosemirror-view';
import trackedTransaction from './utilities/track-changes/trackedTransaction';
import { WaxContext } from './WaxContext';
import { PortalContext } from './PortalContext';
import WaxOptions from './WaxOptions';
import helpers from './helpers/helpers';
import './styles/styles.css';
const serializer = schema => {
const WaxSerializer = DOMSerializer.fromSchema(schema);
return content => {
const container = document.createElement('article');
container.appendChild(WaxSerializer.serializeFragment(content));
return container.innerHTML;
};
};
const createApplication = props => {
const application = Application.create(props);
return application;
};
const createObjectHash = obj => {
const str = stringify(obj);
return CryptoJS.SHA256(str).toString();
};
const createConfigWithHash = config => {
const configHash = createObjectHash(config);
return configHash;
};
let previousDoc;
const Wax = forwardRef((props, innerViewRef) => {
const useWaxView = props => {
const {
autoFocus,
browserSpellCheck,
className,
config,
customValues,
fileUpload,
layout,
placeholder,
readonly,
value,
user,
onChange,
app,
autoFocus,
innerViewRef,
targetFormat,
serializer,
scrollMargin,
scrollThreshold,
onChange,
} = props;
const [application, setApplication] = useState();
const [WaxLayout, setWaxLayout] = useState(null);
const configHash = createConfigWithHash(config);
let view;
const context = useContext(WaxContext);
const [WaxView, setWaxView] = useState(null);
const { createPortal } = useContext(PortalContext);
app.setContext({ ...context, createPortal });
const schema = app.getSchema();
useEffect(() => {
const newApplication = createApplication(props);
if (application) application.resetApp();
setApplication(newApplication);
const Layout = newApplication.container.get('Layout');
if (layout) Layout.setLayout(layout);
setWaxLayout(Layout.layoutComponent);
}, [configHash]);
const finalOnChange = content => {
if (!onChange) return;
const { schema } = application.schema;
helpers.saveContent(content, onChange, schema, serializer, targetFormat);
};
if (!application || !WaxLayout) return null;
return (
<ApplicationProvider app={application}>
<WaxProvider>
<PortalProvider>
<WaxLayout
app={application}
autoFocus={autoFocus}
browserSpellCheck={browserSpellCheck}
className={className}
customValues={customValues}
fileUpload={fileUpload}
innerViewRef={innerViewRef}
onChange={finalOnChange || (() => true)}
placeholder={placeholder}
readonly={readonly}
scrollMargin={scrollMargin}
scrollThreshold={scrollThreshold}
serializer={serializer}
targetFormat={targetFormat}
TrackChange={
application.config.get('config.EnableTrackChangeService') ||
undefined
}
user={user}
value={value}
{...props}
/>
</PortalProvider>
</WaxProvider>
</ApplicationProvider>
);
});
Wax.defaultProps = {
config: { SchemaService: DefaultSchema, services: [] },
customValues: {},
app.bootServices();
app.getShortCuts();
app.getRules();
const options = WaxOptions({
...props,
schema,
plugins: app.getPlugins(),
});
view = new EditorView(null, {
editable: () => !readonly,
customValues,
state: EditorState.create(options),
disallowedTools: [],
user,
scrollMargin: scrollMargin || 200,
scrollThreshold: scrollThreshold || 200,
attributes: {
spellcheck: browserSpellCheck ? 'true' : 'false',
},
});
view.setProps({
dispatchTransaction: transaction => {
const { TrackChange } = props;
const tr =
TrackChange && TrackChange.enabled
? trackedTransaction(transaction, view.state, user, app)
: transaction;
previousDoc = view.state.doc;
const state = view.state.apply(tr);
view.updateState(state);
context.setTransaction(transaction);
if (!transaction.getMeta('outsideView')) {
context.updateView({}, 'main');
}
const docContent =
targetFormat === 'JSON' ? state.doc.toJSON() : state.doc.content;
if (!previousDoc.eq(view.state.doc) || tr.getMeta('forceUpdate'))
onChange(docContent);
},
});
setWaxView({ ...view });
context.updateView(
{
main: view,
},
'main',
);
setTimeout(() => {
if (autoFocus && view) {
view.focus();
}
}, 500);
}, [readonly, customValues, app.id]);
useEffect(() => {
return () => (view = null);
}, []);
useImperativeHandle(innerViewRef, () => ({
getContent() {
return helpers.getDocContent(schema, serializer, targetFormat, context);
},
}));
return WaxView;
};
export default Wax;
export default useWaxView;
wax-prosemirror-services/src/YjsService/YjsService.js
+ 1
− 1
View file @ 4627e3af
......@@ -41,7 +41,7 @@ class YjsService extends Service {
const type = ydoc.getXmlFragment(YjsType || 'prosemirror');
console.log('dsf');
// console.log(this.app.PmPlugins.get('ySyncPlugin'));
this.app.PmPlugins.add('ySyncPlugin', ySyncPlugin(type));
if (cursorBuilder) {
......
yarn.lock
+ 268
− 15
View file @ 4627e3af
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment