Merge pull request #33 from juliankrispel/model-changes

[WChange model to allow Fragments

.github/workflows/test.yml

@@ -31,8 +31,8 @@ jobs:
         run: |
           cd core && yarn link && cd ..
           cd react
-          yarn
           yarn link @zettel/core
+          yarn
           yarn test
 
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Zettel
 
+## [Unreleased]
+
+### Added
+- Added Fragment Model. Fragments are similar to Blocks, they can either contain text or other fragments. They can also contain metadata which makes them useful for things such as mentions. Fragments can cross block boundaries. If `[ ]` is a block boundary and `< >` a fragment boundary we can do things like: `[First <Block][Second> Block]`.
+- Soft newlines are now supported and working correctly (tested in markdown example with codeblocks)
+
 ## [0.0.21] - 2020-05-18
 
 ### Changed

core/package.json

@@ -7,8 +7,8 @@
   "author": "Julian Krispel",
   "license": "MIT",
   "scripts": {
-    "test": "jest",
-    "test:watch": "jest --watch",
+    "test": "../node_modules/.bin/jest .",
+    "test:watch": "../node_modules/.bin/jest . --watch",
     "build": "tsc",
     "start": "tsc -w",
     "prepare": "tsc"
@@ -17,9 +17,6 @@
     "dist"
   ],
   "devDependencies": {
-    "@types/dom-inputevent": "^1.0.4",
-    "@types/jest": "^24.0.19",
-    "ts-jest": "^24.1.0",
-    "jest": "^24.9.0"
+    "@types/dom-inputevent": "^1.0.4"
   }
 }

core/src/EditorState/EditorState.ts

@@ -137,17 +137,17 @@ export default class EditorState {
     const end = _end + 1
     const selectedValue = this.list.value.slice(start, end)
     const hasStyle = selectedValue.every(char =>
-      char.type != null ||
-      char.styles.includes(style)
+      'type' in char ||
+      (char.styles || []).includes(style)
     )
 
     const updatedValue = selectedValue.map(char => {
       const newChar = { ...char }
-      if (newChar.type == null) {
+      if ('char' in newChar) {
         if (hasStyle) {
-          newChar.styles = newChar.styles.filter(st => st !== style)
-        } else if (!newChar.styles.includes(style)) {
-          newChar.styles = newChar.styles.concat([style])
+          newChar.styles = (newChar.styles || []).filter(st => st !== style)
+        } else if (!(newChar.styles || []).includes(style)) {
+          newChar.styles = (newChar.styles || []).concat([style])
         }
       }