Skip to content
This repository has been archived by the owner on Apr 7, 2024. It is now read-only.

Hocuspocus #16

Merged
merged 38 commits into from
Oct 20, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a3dccf1
feat: use hocuspocus server for ydoc
jackbuehner Sep 18, 2022
01d56b1
feat: show connecting message in splash screen for full screen editor
jackbuehner Sep 18, 2022
ebe2b71
feat: remove save and refetch functionality
jackbuehner Sep 18, 2022
712eb29
fix: use correct colors in backstage light theme
jackbuehner Sep 18, 2022
c42d602
fix: use updated sync status at all times
jackbuehner Sep 26, 2022
5d9f16a
fix: use current publish timestamp in modal
jackbuehner Sep 26, 2022
27a0749
fix: expect correct watchers array format
jackbuehner Sep 26, 2022
e0fd850
fix: resolve type errors
jackbuehner Sep 26, 2022
fb97788
feat: remove util to mark fields unsaved
jackbuehner Sep 26, 2022
af7c5a1
fix: hide hover and focus indicators for disabled collaborative fields
jackbuehner Sep 26, 2022
7661bc0
fix: disable editing via node views when editing is disabled
jackbuehner Sep 26, 2022
7f4fa4b
fix: properly show placeholders and manage contenteditable
jackbuehner Sep 26, 2022
a3c46a3
fix: show tiptap noticebar under popups
jackbuehner Sep 26, 2022
e6bcce4
feat: enable dragging widgets
jackbuehner Sep 26, 2022
de4e70e
fix: disable stage dropdown when fields disabled
jackbuehner Sep 26, 2022
bac9f6b
feat: enable restoring hidden docs
jackbuehner Sep 26, 2022
3df90bc
feat: link ws and webrtc provider awareness
jackbuehner Sep 27, 2022
c34a5c7
fix: rerender tiptap when document, provider, or field changes
jackbuehner Sep 27, 2022
bc8b56e
fix: do not wait for ws sync if provider has already connected
jackbuehner Sep 27, 2022
e978139
feat: hide fields when document not found and show message
jackbuehner Sep 28, 2022
60d3ef7
fix: exempt embedded from docNotFound check
jackbuehner Sep 29, 2022
d4c2844
feat: show loading spinner while doc is connecting
jackbuehner Sep 29, 2022
be74e52
feat: add notice that saving is gone
jackbuehner Oct 2, 2022
00c6bf9
feat: hide nav prompt unless disconnected
jackbuehner Oct 3, 2022
15322e3
feat: add more descriptive loading messages
jackbuehner Oct 3, 2022
815fb13
feat: remove ydoc logic from publish modal
jackbuehner Oct 10, 2022
c64b038
fix: do not attempt to create moment date from null
jackbuehner Oct 10, 2022
f8b3a40
fix: incorrect working - manually save instead of autosave
jackbuehner Oct 11, 2022
6d853a7
feat: merge all history actions that are compatable
jackbuehner Oct 13, 2022
055bd5b
feat: only request needed fields for collection table data
jackbuehner Oct 13, 2022
d213f3b
fix: start loop from end of array
jackbuehner Oct 13, 2022
24788ca
feat: merge same activity from different order within 6 hours
jackbuehner Oct 13, 2022
5782b54
feat: include _id in awareness
jackbuehner Oct 13, 2022
4c3c08b
fix: de-duplicate users when merging
jackbuehner Oct 13, 2022
0faa395
feat: add alert when editing a published document
jackbuehner Oct 13, 2022
e47fc17
feat: replace analytics chart with update log
jackbuehner Oct 13, 2022
50c54bf
feat: include app version in hp server url params
jackbuehner Oct 20, 2022
532da6f
feat: include packageJson version in webrtc password
jackbuehner Oct 20, 2022
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
Prev Previous commit
Next Next commit
fix: resolve type errors
  • Loading branch information
jackbuehner committed Sep 26, 2022
commit e0fd8507b2b197d2d9777a7cf33223e1fc3a0447
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function CollaborativeCheckbox(props: CollaborativeCheckboxProps) {
// keep track of the checked status in the checkbox field shared type
const [checked, setChecked] = useState(sharedType?.get(y.field) || undefined);
useEffect(() => {
const handleChange = (evt: YMapEvent<Record<string, boolean>>) => {
const handleChange = (evt: YMapEvent<Record<string, boolean | null | undefined>>) => {
const change = evt.changes.keys.get(y.field);
if (change) {
if (change.action === 'delete') setChecked(undefined);
Expand Down
3 changes: 1 addition & 2 deletions src/components/CollaborativeFields/CollaborativeDocArray.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { CollaborativeFieldProps, CollaborativeFieldWrapper } from '.';
import { DeconstructedSchemaDefType } from '../../hooks/useCollectionSchemaConfig/useCollectionSchemaConfig';
import { colorType, themeType } from '../../utils/theme/theme';
import { Button, buttonEffect } from '../Button';
import { Value } from './CollaborativeCombobox';
import utils from './utils';

interface CollaborativeDocArrayProps extends CollaborativeFieldProps {
Expand Down Expand Up @@ -54,7 +53,7 @@ function CollaborativeDocArray(props: CollaborativeDocArrayProps) {
if (yarray) {
setArr(yarray.toArray());

const handleChange = (evt: Y.YArrayEvent<Value<string>>) => {
const handleChange = (evt: Y.YArrayEvent<Record<string, unknown>>) => {
if (evt.changes.delta) {
setArr(yarray.toArray());

Expand Down