Merge pull request #121 from aidenybai/revert-120-staging

Revert "Staging"
aidenybai · Apr 15, 2021 · 6777942 · 6777942
2 parents 4f4dda6 + 1731624
commit 6777942
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/component.ts b/src/component.ts
@@ -26,11 +26,11 @@ export class Component {
       typeof el === 'string'
         ? document.querySelector<HTMLElement>(el) || document.body
         : (el as HTMLElement);
-    const newState = { ...this.state, $render: this.render.bind(this) };
+    const $render = (deps: string[] = Object.keys(this.state)) => this.render(deps);
 
     this.ast = compile(rootEl, this.state);
     this.directives = { ...this.directives, ...directives };
-    this.state = reactive(newState, this.render.bind(this), this.watchers);
+    this.state = reactive({ ...this.state, $render }, this.render.bind(this), this.watchers);
 
     this.render();
 

diff --git a/src/core/compile.ts b/src/core/compile.ts
@@ -10,7 +10,8 @@ export const isListRenderScope = (el: HTMLElement): boolean => {
 };
 
 export const isUnderListRenderScope = (el: HTMLElement): boolean => {
-  return el.parentElement && el.parentElement.hasAttribute(`${DIRECTIVE_PREFIX}for`);
+  if (!el.parentElement) return false;
+  return el.parentElement.hasAttribute(`${DIRECTIVE_PREFIX}for`);
 };
 
 export const createASTNode = (el: HTMLElement, state: State): ASTNode | undefined => {