more todo, fix hickups, renable style

barelyhuman · Oct 22, 2022 · 866cd48 · 866cd48
1 parent 9e83b00
commit 866cd48
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 15 deletions.
diff --git a/dom/src/dom.js b/dom/src/dom.js
@@ -5,5 +5,7 @@ export function createDOM(rootTag) {
   registry.reset()
   registry.root = rootTag
   var window = new Window()
+  // @ts-ignore
+  Object.assign(global, window)
   return window.document
 }
diff --git a/dom/src/dom/binding.js b/dom/src/dom/binding.js
@@ -41,6 +41,10 @@ export class Binding {
     return this.props.get(key)
   }
 
+  removeProp(key) {
+    return this.props.delete(key)
+  }
+
   getAllProps() {
     const res = {}
     for (let [key, val] of Object.entries(this.props)) {

diff --git a/dom/src/dom/bridge.js b/dom/src/dom/bridge.js
@@ -22,7 +22,7 @@ import {
   FOCUS_EVENTS,
   KEYBOARD_EVENTS,
 } from './constants'
-import { registry, TYPES } from './registry'
+import { FALSE_TYPES, registry, TYPES } from './registry'
 import { isSameChild } from './utils'
 
 class Bridge {
@@ -79,7 +79,7 @@ class Bridge {
       }
       case 'create': {
         const type = params[1]
-        if (type === '#document') {
+        if (Object.keys(FALSE_TYPES).indexOf(type) > -1) {
           break
         }
         const rawViewClass = TYPES[type]

diff --git a/dom/src/dom/document.js b/dom/src/dom/document.js
@@ -33,6 +33,9 @@ export class Document extends Element {
     return new Event('')
   }
 
+  // TODO:
+  createComment() {}
+
   createElementNS(localName, nsURI) {
     if (nsURI.contains('2000 / svg') > -1) {
       return new SVGElement(localName)

diff --git a/dom/src/dom/element.js b/dom/src/dom/element.js
@@ -1,5 +1,6 @@
 import {
   BINDING,
+  BINDING_NODE,
   CURRENT_STYLE,
   EVENTPHASE_AT_TARGET,
   EVENTPHASE_BUBBLE,
@@ -11,6 +12,8 @@ import {
   STYLE,
 } from './constants'
 import { EventTarget } from './event-target'
+import { registry } from './registry'
+import { Text } from './text'
 
 export class Element extends EventTarget {
   [NS] = 'http://www.w3.org/1999/xhtml'
@@ -124,12 +127,12 @@ export class Element extends EventTarget {
 
 function createStyleBinding(id) {
   let style = {}
-  // const binding = BINDINGS.get(id)
-  // Object.defineProperty(style, CURRENT_STYLE, { value: new Map() })
-  // Object.defineProperty(style, OWNER_NODE, {
-  //   get: NODES.get.bind(NODES, binding),
-  // })
-  // return new Proxy(style, STYLE_PROXY)
+  const binding = registry.getBinding(id)
+  Object.defineProperty(style, CURRENT_STYLE, { value: new Map() })
+  Object.defineProperty(style, OWNER_NODE, {
+    get: () => binding[BINDING_NODE],
+  })
+  return new Proxy(style, STYLE_PROXY)
 }
 
 const STYLE_PROXY = {

diff --git a/dom/src/dom/node.js b/dom/src/dom/node.js
@@ -60,6 +60,14 @@ export class Node {
   }
 
   insertBefore(node, refNode) {
+    if (!node) {
+      return
+    }
+
+    if (!refNode) {
+      return this.appendChild(node)
+    }
+
     const old = this.children.slice()
     const index = getChildIndex(this, refNode)
     const before = this.children.slice(0, index)

diff --git a/dom/src/dom/registry.js b/dom/src/dom/registry.js
@@ -1,13 +1,20 @@
-export const TYPES = {
-  '#text': {
-    type: 'RCTRawText',
-  },
+export const FALSE_TYPES = {
   '#document': {
     type: 'Document',
   },
   '#fragment': {
     type: 'DocumentFragment',
   },
+  'template': {
+    type: 'DocumentFragment',
+  },
+}
+
+export const TYPES = {
+  ...FALSE_TYPES,
+  '#text': {
+    type: 'RCTRawText',
+  },
 }
 
 class Registry {

diff --git a/dom/src/dom/text.js b/dom/src/dom/text.js
@@ -1,8 +1,7 @@
-import { Node } from './node'
-
 import { BINDING, NODE_TYPES } from './constants'
+import { EventTarget } from './event-target'
 
-export class Text extends Node {
+export class Text extends EventTarget {
   constructor(data) {
     super('#text', NODE_TYPES.TEXT_NODE)
     this[BINDING].create()