[Work in progress] new styles system

Lexical/Core/Constants.swift

@@ -70,6 +70,7 @@ public enum DirtyType {
   case fullReconcile
 }
 
+@available(*, deprecated, message: "Use new styles system")
 @objc public enum TextFormatType: Int {
   case bold
   case italic

Lexical/Core/Editor.swift

@@ -94,6 +94,9 @@ public class Editor: NSObject {
 
   internal var nodeTransforms: [NodeType: [(Int, NodeTransform)]] = [:]
 
+  // Styles. For all methods to manipulate these, see Styles.swift
+  internal var registeredStyles: StylesRegistrationDict = [:]
+
   // Used to help co-ordinate selection and events
   internal var compositionKey: NodeKey?
   public var dirtyType: DirtyType = .noDirtyNodes // TODO: I made this public to work around an issue in playground. @amyworrall
@@ -161,6 +164,7 @@ public class Editor: NSObject {
   public static func createHeadless(editorConfig: EditorConfig) -> Editor {
     let editor = Editor(editorConfig: editorConfig)
     editor.headless = true
+    registerRichText(editor: editor)
     return editor
   }
 
@@ -398,7 +402,7 @@ public class Editor: NSObject {
           if selection != nil {
             try paragraph.select(anchorOffset: nil, focusOffset: nil)
             if let selection = selection as? RangeSelection {
-              selection.clearFormat()
+              selection.clearStoredStyles()
             }
           }
         }

Lexical/Core/EditorState.swift

@@ -102,19 +102,17 @@ public class EditorState: NSObject {
    The JSON string is designed to be interoperable with Lexical JavaScript (subject to the individual node classes using matching keys).
    */
   public func toJSON() throws -> String {
-    let string: String? = try read {
-      guard let rootNode = getRootNode() else {
-        throw LexicalError.invariantViolation("Could not get RootNode")
-      }
-      let persistedEditorState = SerializedEditorState(rootNode: rootNode)
-      let encodedData = try JSONEncoder().encode(persistedEditorState)
-      guard let jsonString = String(data: encodedData, encoding: .utf8) else { return "" }
-      return jsonString
+    guard getActiveEditor() != nil else {
+      throw LexicalError.invariantViolation("Requires editor to export JSON")
     }
-    if let string {
-      return string
+    guard let rootNode = getRootNode() else {
+      throw LexicalError.invariantViolation("Could not get RootNode")
     }
-    throw LexicalError.invariantViolation("Expected string")
+    let persistedEditorState = SerializedEditorState(rootNode: rootNode)
+    let encodedData = try JSONEncoder().encode(persistedEditorState)
+    guard let jsonString = String(data: encodedData, encoding: .utf8) else { throw LexicalError.invariantViolation("Expected string") }
+
+    return jsonString
   }
 
   /**

Lexical/Core/Errors.swift

@@ -13,4 +13,5 @@ public enum LexicalError: Error {
   case sanityCheck(errorMessage: String, textViewText: String, fullReconcileText: String)
   case reconciler(String)
   case rangeCacheSearch(String)
+  case styleValidation(String)
 }

Lexical/Core/Events.swift

@@ -176,16 +176,8 @@ internal func onSelectionChange(editor: Editor) {
       }
 
       try lexicalSelection.applyNativeSelection(nativeSelection)
+      lexicalSelection.styles = (try? lexicalSelection.anchor.getNode().getStyles()) ?? [:]
 
-      switch lexicalSelection.anchor.type {
-      case .text:
-        guard let anchorNode = try lexicalSelection.anchor.getNode() as? TextNode else { break }
-        lexicalSelection.format = anchorNode.getFormat()
-      case .element:
-        lexicalSelection.format = TextFormat()
-      default:
-        break
-      }
       editor.dispatchCommand(type: .selectionChange, payload: nil)
     }
   } catch {
@@ -217,6 +209,10 @@ internal func handleIndentAndOutdent(insertTab: (Node) -> Void, indentOrOutdent:
 
 public func registerRichText(editor: Editor) {
 
+  // Style defaults and commands are handled in Styles.swift
+  registerDefaultStyles(editor: editor)
+  registerStyleCommands(editor: editor)
+
   _ = editor.registerCommand(type: .insertLineBreak, listener: { [weak editor] payload in
     guard let editor else { return false }
     do {

Lexical/Core/Nodes/CodeHighlightNode.swift

@@ -16,26 +16,31 @@ public class CodeHighlightNode: TextNode {
 
   override public init() {
     super.init()
-    self.type = NodeType.codeHighlight
   }
 
   required init(text: String, highlightType: String?, key: NodeKey? = nil) {
     super.init(text: text, key: key)
     self.highlightType = highlightType
-    self.type = NodeType.codeHighlight
   }
 
   public required init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     try super.init(from: decoder)
 
     self.highlightType = try container.decode(String.self, forKey: .highlightType)
-    self.type = NodeType.codeHighlight
   }
 
   public required convenience init(text: String, key: NodeKey?) {
     self.init(text: text, highlightType: nil, key: key)
   }
+
+  public required init(styles: StylesDict, key: NodeKey?) {
+    fatalError("init(styles:key:) has not been implemented")
+  }
+
+  public override class func getType() -> NodeType {
+    return .codeHighlight
+  }
 
   override public func encode(to encoder: Encoder) throws {
     try super.encode(to: encoder)
@@ -48,7 +53,12 @@ public class CodeHighlightNode: TextNode {
   }
 
   // Prevent formatting (bold, underline, etc)
+  @available(*, deprecated)
   override public func setFormat(format: TextFormat) throws -> CodeHighlightNode {
     return try self.getWritable()
   }
+
+  override public func setStyles(_ stylesDict: StylesDict) throws {}
+
+  override public func setStyle<T>(_ style: T.Type, _ value: T.StyleValueType?) throws where T : Style {}
 }

Lexical/Core/Nodes/CodeNode.swift

@@ -44,21 +44,26 @@ public class CodeNode: ElementNode {
 
   override public init() {
     super.init()
-    self.type = NodeType.code
   }
 
   required init(language: String, key: NodeKey? = nil) {
     super.init(key)
     self.language = language
-    self.type = NodeType.code
   }
 
   public required init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     try super.init(from: decoder)
 
     self.language = try container.decode(String.self, forKey: .language)
-    self.type = NodeType.code
+  }
+
+  public required init(styles: StylesDict, key: NodeKey?) {
+    super.init(styles: styles, key: key)
+  }
+
+  public override class func getType() -> NodeType {
+    return .code
   }
 
   override public func encode(to encoder: Encoder) throws {

Lexical/Core/Nodes/DecoratorNode.swift

@@ -49,18 +49,22 @@ import UIKit
 
  */
 open class DecoratorNode: Node {
-  override public init() {
-    super.init()
+  public init() {
+    super.init(styles: [:], key: nil)
   }
 
-  override public required init(_ key: NodeKey?) {
-    super.init(key)
+  public required init(_ key: NodeKey?) {
+    super.init(styles: [:], key: key)
   }
 
   public required init(from decoder: Decoder) throws {
     try super.init(from: decoder)
   }
-
+
+  public required init(styles: StylesDict, key: NodeKey?) {
+    super.init(styles: styles, key: key)
+  }
+
   override open func encode(to encoder: Encoder) throws {
     try super.encode(to: encoder)
   }

Lexical/Core/Nodes/ElementNode.swift

@@ -24,12 +24,12 @@ open class ElementNode: Node {
     return direction
   }
 
-  override public init() {
-    super.init()
+  public init() {
+    super.init(styles: [:], key: nil)
   }
 
-  override public init(_ key: NodeKey?) {
-    super.init(key)
+  public init(_ key: NodeKey?) {
+    super.init(styles: [:], key: key)
   }
 
   public required init(from decoder: Decoder) throws {
@@ -73,14 +73,17 @@ open class ElementNode: Node {
       node.parent = self.key
     }
   }
-
+
+  public required init(styles: StylesDict, key: NodeKey?) {
+    super.init(styles: styles, key: key)
+  }
+
   override open func encode(to encoder: Encoder) throws {
     try super.encode(to: encoder)
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(self.getChildren(), forKey: .children)
     try container.encode(self.direction, forKey: .direction)
     try container.encode(self.indent, forKey: .indent)
-    try container.encode("", forKey: .format)
   }
 
   @discardableResult

Lexical/Core/Nodes/HeadingNode.swift

@@ -36,23 +36,28 @@ public class HeadingNode: ElementNode {
     self.tag = tag
 
     super.init()
-    self.type = NodeType.heading
   }
 
   public required init(_ key: NodeKey?, tag: HeadingTagType) {
     self.tag = tag
     super.init(key)
-    self.type = NodeType.heading
+  }
+
+  override class public func getType() -> NodeType {
+    return .heading
   }
 
   public required init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     self.tag = try container.decode(HeadingTagType.self, forKey: .tag)
     try super.init(from: decoder)
-
-    self.type = NodeType.heading
   }
-
+
+  public required init(styles: StylesDict, key: NodeKey?) {
+    tag = .h1
+    super.init(styles: styles, key: key)
+  }
+
   override public func encode(to encoder: Encoder) throws {
     try super.encode(to: encoder)
     var container = encoder.container(keyedBy: CodingKeys.self)

Lexical/Core/Nodes/LineBreakNode.swift

@@ -6,34 +6,35 @@
  */
 
 public class LineBreakNode: Node {
-  override public init() {
-    super.init()
-    self.type = NodeType.linebreak
+  public init() {
+    super.init(styles: [:], key: nil)
   }
 
-  override required init(_ key: NodeKey?) {
-    super.init(key)
-    self.type = NodeType.linebreak
+  required public init(styles: StylesDict, key: NodeKey?) {
+    super.init(styles: styles, key: key)
   }
 
   public required init(from decoder: Decoder) throws {
     try super.init(from: decoder)
-    self.type = NodeType.linebreak
+  }
+
+  public override class func getType() -> NodeType {
+    .linebreak
   }
 
   override public func encode(to encoder: Encoder) throws {
     try super.encode(to: encoder)
   }
 
   override public func clone() -> Self {
-    Self(key)
+    Self(styles: styles, key: key)
   }
 
   override public func getPostamble() -> String {
     return "\n"
   }
 
   public func createLineBreakNode() -> LineBreakNode {
-    return LineBreakNode()
+    return LineBreakNode(styles: [:], key: nil)
   }
 }