removing data-live-id-value in favor of data-live-id - no need for both

Author: weaverryan

src/LiveComponent/assets/src/live_controller.ts

@@ -50,7 +50,6 @@ export default class extends Controller<HTMLElement> implements LiveController {
     readonly csrfValue!: string;
     readonly hasDebounceValue: boolean;
     readonly debounceValue: number;
-    readonly idValue: string;
     readonly fingerprintValue: string
 
     /** The component, wrapped in the convenience Proxy */
@@ -70,7 +69,7 @@ export default class extends Controller<HTMLElement> implements LiveController {
     initialize() {
         this.handleDisconnectedChildControllerEvent = this.handleDisconnectedChildControllerEvent.bind(this);
 
-        const id = this.idValue || null;
+        const id = this.element.dataset.liveId || null;
 
         this.component = new Component(
             this.element,

src/LiveComponent/assets/src/morphdom.ts

@@ -20,7 +20,7 @@ export function executeMorphdom(
     childComponents.forEach((childComponent) => {
         childComponentMap.set(childComponent.element, childComponent);
         // TODO: add driver to make this agnostic
-        const childComponentToElement = rootToElement.querySelector(`[data-live-id-value=${childComponent.id}]`)
+        const childComponentToElement = rootToElement.querySelector(`[data-live-id=${childComponent.id}]`)
         if (childComponentToElement && childComponentToElement.tagName !== childComponent.element.tagName) {
             // we need to "correct" the tag name for the child to match the "from"
             // so that we always get a "diff", not a remove/add
@@ -36,12 +36,7 @@ export function executeMorphdom(
             }
 
             // TODO: abstract out to make this function agnostic of markup
-            if (node.dataset.liveId) {
-                return node.dataset.liveId;
-            }
-
-            // TODO: do we really need data-live-id and data-live-value-id?
-            return node.dataset.liveIdValue
+            return node.dataset.liveId;
         },
         onBeforeElUpdated: (fromEl, toEl) => {
             if (fromEl === rootFromElement) {

src/LiveComponent/assets/test/tools.ts

@@ -441,7 +441,7 @@ export function initComponent(data: any, props: any = {}, controllerValues: any
         data-live-props-value="${dataToJsonAttribute(props)}"
         ${controllerValues.debounce ? `data-live-debounce-value="${controllerValues.debounce}"` : ''}
         ${controllerValues.csrf ? `data-live-csrf-value="${controllerValues.csrf}"` : ''}
-        ${controllerValues.id ? `data-live-id-value="${controllerValues.id}"` : ''}
+        ${controllerValues.id ? `data-live-id="${controllerValues.id}"` : ''}
         ${controllerValues.fingerprint ? `data-live-fingerprint-value="${controllerValues.fingerprint}"` : ''}
     `;
 }