rf

README.md

@@ -34,14 +34,6 @@ Fine grained reactive UI Library.
       Router with a familiar react-router like API
     </td>
   </tr>
-  <tr>
-    <td>
-      <a href="https://github.com/abhishiv/rocky7-yjs">rocky7-yjs</a>
-    </td>
-    <td>
-      Bidirectional sync between Rocky7 stores and Yjs documents
-    </td>
-  </tr>
 </table>
 
 #### Sponsors

src/core/state/experimental.ts

@@ -46,6 +46,7 @@ export type StoreManager<T = unknown> = {
   wires: Set<Wire<any>>;
   type: typeof Constants.STORE;
   tasks: Set<{ path: string[]; observor: Function }>;
+  unsubscribe: Function;
 };
 
 export type StoreChange = {
@@ -262,6 +263,9 @@ export const createStore = <T = unknown>(
     wires: new Set<Wire>(),
     type: Constants.STORE,
     tasks: new Set(),
+    unsubscribe: () => {
+      onChange.unsubscribe(observedObject);
+    },
   };
   const observedObject = onChange(
     obj as Record<any, any>,
@@ -313,6 +317,7 @@ export const createStore = <T = unknown>(
   storeManager.value = observedObject;
   STORE_COUNTER++;
   storeManager.id = "store|" + STORE_COUNTER;
+
   return s;
 };
 

src/dom/api.ts

@@ -22,15 +22,17 @@ import {
   createWire,
   createStore,
   StoreCursor,
+  getProxyMeta,
 } from "../core/state";
 import { LiveDocumentFragment } from "./dom";
+import { getCursorProxyMeta } from "../utils";
 
 export const insertElement = (
   renderContext: RenderContext,
   parentStep: TreeStep,
   parentPath: string[],
   el: VElement,
-  after?: string,
+  after?: string
 ) => {
   console.log("insert", parentPath, el, after);
 
@@ -53,15 +55,15 @@ export const insertElement = (
     root,
     afterIndex && afterIndex > -1
       ? step.children[afterIndex as number]
-      : undefined,
+      : undefined
   );
 };
 
 export const removeElement = (
   renderContext: RenderContext,
   parentStep: TreeStep,
   parentPath: string[],
-  key: string,
+  key: string
 ) => {
   const step = parentPath.reduce<TreeStep | undefined>((step, key) => {
     if (!step) return;
@@ -78,7 +80,7 @@ export const updateElement = (
   renderContext: RenderContext,
   parentStep: TreeStep,
   key: string[],
-  value: string,
+  value: string
 ) => {
   // todo
 };
@@ -87,7 +89,7 @@ export const addNode = (
   renderCtx: RenderContext,
   parentStep: TreeStep,
   node: TreeStep,
-  after?: TreeStep,
+  after?: TreeStep
 ) => {
   // console.log("addNode", parentStep, node, after);
   const handle = (node: TreeStep) => {
@@ -151,8 +153,12 @@ export const removeNode = (renderCtx: RenderContext, node: TreeStep) => {
       if (
         step.type === DOMConstants.ComponentTreeStep &&
         step.onUnmount.length > 0
-      )
+      ) {
         step.onUnmount.forEach((el) => el());
+        for (var s in step.state.stores) {
+          // todo unsubscribe from store
+        }
+      }
       rmNodes(step.dom);
       step.dom = undefined;
     }
@@ -220,7 +226,7 @@ export const getRenderContext = (container: HTMLElement, element: VElement) => {
 
 export const getUtils = (
   renderContext: RenderContext,
-  parentStep: ComponentTreeStep,
+  parentStep: ComponentTreeStep
 ): Omit<ComponentUtils, "utils"> => {
   return {
     step: parentStep,

src/index.ts

@@ -1,4 +1,3 @@
-import "./object-observer.d.ts";
 export * from "./dom";
 export * from "./core/state";
 export * from "./stdlib/index";