octane 0.2.3 → 0.2.4

package/dist/cjs/css.cjs

@@ -20,6 +20,7 @@ var css_exports = {};
 __export(css_exports, {
   devWarnStyleCoercion: () => devWarnStyleCoercion,
   devWarnStyleProperty: () => devWarnStyleProperty,
+  mergeClass: () => mergeClass,
   normalizeClass: () => normalizeClass,
   styleName: () => styleName
 });
@@ -47,6 +48,13 @@ function normalizeClass(value) {
   }
   return str;
 }
+function mergeClass(left, right) {
+  const a = normalizeClass(left);
+  const b = normalizeClass(right);
+  if (!a) return b;
+  if (!b) return a;
+  return a + " " + b;
+}
 const styleNameCache = /* @__PURE__ */ new Map();
 function styleName(name) {
   const cached = styleNameCache.get(name);
@@ -111,6 +119,7 @@ function devWarnStyleCoercion(name, value) {
 0 && (module.exports = {
   devWarnStyleCoercion,
   devWarnStyleProperty,
+  mergeClass,
   normalizeClass,
   styleName
 });

package/dist/cjs/dom-tables.cjs

@@ -453,8 +453,13 @@ for (const base of [
   UNITLESS_STYLE_PROPS.add("moz" + c);
   UNITLESS_STYLE_PROPS.add("o" + c);
 }
+const unitlessStylePropCache = /* @__PURE__ */ new Map();
 function isUnitlessStyleProp(name) {
-  return UNITLESS_STYLE_PROPS.has(name.replaceAll("-", "").toLowerCase());
+  const cached = unitlessStylePropCache.get(name);
+  if (cached !== void 0) return cached;
+  const result = UNITLESS_STYLE_PROPS.has(name.replaceAll("-", "").toLowerCase());
+  unitlessStylePropCache.set(name, result);
+  return result;
 }
 function cssStyleValue(name, value) {
   if (typeof value === "number" && value !== 0 && name.charCodeAt(0) !== 45 && !isUnitlessStyleProp(name)) {

package/dist/cjs/runtime.cjs

@@ -1724,12 +1724,17 @@ function journalDefaultValue(input) {
     journalAttr(input, "value");
   }
 }
+function radioCousins(input) {
+  if (input.form !== null) return input.form.elements;
+  const root = input.getRootNode();
+  return root.nodeType === 9 ? root.getElementsByName(input.name) : root.querySelectorAll('input[type="radio"]');
+}
 function journalRadioCousins(input) {
   const name = input.name;
-  const group = input.form !== null ? input.form.elements : typeof document !== "undefined" ? document.getElementsByName(name) : [];
+  const group = radioCousins(input);
   for (let i = 0; i < group.length; i++) {
     const other = group[i];
-    if (other === input || !other.checked || other.localName !== "input" || other.type !== "radio" || other.name !== name) {
+    if (other === input || !other.checked || other.localName !== "input" || other.type !== "radio" || other.name !== name || other.form !== input.form) {
       continue;
     }
     TRANSITION_JOURNAL.push(JOURNAL_PROP, other, "checked", true);
@@ -10053,8 +10058,9 @@ function normalizedHostProp(el, rawName) {
 }
 function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false) {
   const props = /* @__PURE__ */ new Map();
+  let classMerges = null;
   let sourceOrder = 0;
-  const record = (rawName, value) => {
+  function record(rawName, value) {
     if (typeof rawName !== "string") return;
     const order = sourceOrder++;
     const previous = props.get(rawName);
@@ -10064,10 +10070,15 @@ function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false)
       firstOrder: previous?.firstOrder ?? order,
       lastOrder: order
     });
-  };
+  }
   for (const source of sources) {
     if (!source[0]) {
-      record(source[1], source[2]);
+      const rawName = source[1];
+      if (source[3] === true && typeof rawName === "string" && (rawName === "class" || rawName === "className")) {
+        (classMerges ??= []).push({ rawName, value: source[2], order: sourceOrder++ });
+        continue;
+      }
+      record(rawName, source[2]);
       continue;
     }
     const spread = source[1];
@@ -10093,6 +10104,22 @@ function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false)
       writer.lastOrder
     ]);
   }
+  if (classMerges !== null) {
+    for (const extra of classMerges) {
+      const [identity, name] = normalizedHostProp(el, extra.rawName);
+      const previous = values.get(identity);
+      if (previous !== void 0) {
+        values.set(identity, [
+          previous[0],
+          (0, import_css.mergeClass)(previous[1], extra.value),
+          previous[2],
+          extra.order
+        ]);
+        continue;
+      }
+      values.set(identity, [name, extra.value, extra.order, extra.order]);
+    }
+  }
   const resolved = /* @__PURE__ */ Object.create(null);
   const ordered = [...values.values()];
   if (needsWinningOrderSort) ordered.sort((a, b) => a[2] - b[2]);
@@ -10268,11 +10295,12 @@ function headBlock(scope, slot, key, tag, attrs, text) {
     const ownerDocument = parent.nodeType === 9 ? parent : parent.ownerDocument;
     const head = ownerDocument.head;
     let el2 = adoptServerHeadEl(head, (0, import_head_ownership.headOwnershipKey)(key, rootIdentifierPrefix(scope.block)), tag);
+    const adopted = el2 !== null;
     if (el2 === null) {
       el2 = ownerDocument.createElement(tag);
       head.appendChild(el2);
     }
-    state = { el: el2 };
+    state = { el: el2, attrNames: adopted ? el2.getAttributeNames() : void 0 };
     scope.slots[slot] = state;
     (scope.cleanups ??= []).push(() => {
       removeHeadEventListeners(state, null);
@@ -10281,8 +10309,20 @@ function headBlock(scope, slot, key, tag, attrs, text) {
     });
   }
   const el = state.el;
+  if (TRANSITION_JOURNAL !== null) {
+    journalObjectOnce(state);
+    journalBag();
+  }
   if (state.handlers !== void 0) removeHeadEventListeners(state, attrs);
+  const previousNames = state.attrNames;
+  if (previousNames !== void 0) {
+    for (let i = 0; i < previousNames.length; i++) {
+      const name = previousNames[i];
+      if (attrs === null || !(name in attrs)) setAttribute(el, name, null);
+    }
+  }
   if (attrs !== null) {
+    const names = [];
     for (const k in attrs) {
       const ev = k.length > 2 && k[0] === "o" && k[1] === "n" ? eventSlot(k) : null;
       if (ev !== null) {
@@ -10303,12 +10343,19 @@ function headBlock(scope, slot, key, tag, attrs, text) {
         }
         continue;
       }
+      names.push(k);
       setAttribute(el, k, attrs[k]);
     }
+    state.attrNames = names;
+  } else {
+    state.attrNames = void 0;
   }
-  if (text != null) {
-    const t = String(text);
-    if (el.textContent !== t) el.textContent = t;
+  if (text != null || tag === "title") {
+    const t = text == null ? "" : String(text);
+    if (el.textContent !== t) {
+      if (TRANSITION_JOURNAL !== null) journalRootRange(el, null, null);
+      el.textContent = t;
+    }
   }
 }
 function namespaceHead(props, scope) {
@@ -10341,8 +10388,21 @@ function namespaceHeadElement(headKey, tag, attrs, text, authoredKey) {
   return createElement(namespaceHead, config);
 }
 function injectStyle(id, css, nonce) {
+  if (typeof document === "undefined") {
+    _injectedStyles.add(id);
+    return;
+  }
+  const existing = document.querySelector(`style[data-octane="${id}"]`);
+  if (existing !== null) {
+    if (_injectedStyles.has(id)) {
+      if (existing.textContent !== css) existing.textContent = css;
+    } else {
+      _injectedStyles.add(id);
+    }
+    return;
+  }
   if (_injectedStyles.has(id)) return;
-  if (typeof document !== "undefined" && document.querySelector(`style[data-octane="${id}"], style[data-href="octane-${id}"]`)) {
+  if (document.querySelector(`style[data-href~="octane-${id}"]`)) {
     _injectedStyles.add(id);
     return;
   }
@@ -11370,13 +11430,12 @@ function armControlledBase(el) {
       sv: null,
       sawV: false,
       sawC: false,
+      sawDC: false,
       dvv: UNCONTROLLED,
       composing: false,
       compositionEndTask: void 0,
       queued: false,
       formSeen: false,
-      formDefaultValue: UNCONTROLLED,
-      formDefaultChecked: UNCONTROLLED,
       formMultiple: false
     };
     el.$$ctrl = ctrl;
@@ -11551,9 +11610,14 @@ function setCheckedState(input, value, ctrl) {
     if (process.env.NODE_ENV !== "production")
       queueDevFormDiagnostic(input, CURRENT_SCOPE ?? void 0);
     const hydration = activeHydration();
-    if (hydration !== null && !hydration.isFresh(input)) return;
-    if (input.checked !== b) input.checked = b;
+    if (hydration !== null && !hydration.isFresh(input)) {
+      input.checked = input.checked;
+      ctrl.sawDC = true;
+      return;
+    }
+    input.checked = b;
     input.defaultChecked = b;
+    ctrl.sawDC = true;
     return;
   }
   if (process.env.NODE_ENV !== "production" && ctrl.c === -1) devWarnControlledFlip(input, true);
@@ -11567,7 +11631,7 @@ function inActivationWindow(input) {
   const target = activationCheckable;
   if (target === null) return false;
   if (input === target) return true;
-  return input.type === "radio" && target.type === "radio" && input.name !== "" && input.name === target.name && input.form === target.form;
+  return input.type === "radio" && target.type === "radio" && input.name !== "" && input.name === target.name && input.form === target.form && (input.form !== null || input.getRootNode() === target.getRootNode());
 }
 function setChecked(el, value) {
   const ctrl = armControlled(el);
@@ -11705,6 +11769,7 @@ function setDefaultValue(el, value, initial) {
   }
 }
 const DEFAULT_VALUE_BASELINE = /* @__PURE__ */ Symbol("octane.defaultValue");
+const DEFAULT_CHECKED_INITIALIZED = /* @__PURE__ */ Symbol("octane.defaultCheckedInitialized");
 function setDefaultValueUncontrolled(el, value) {
   const hydration = activeHydration();
   const input = el;
@@ -11733,10 +11798,30 @@ function setDefaultValueUncontrolled(el, value) {
 }
 function setDefaultChecked(el, value) {
   const ctrl = armControlled(el);
+  const input = el;
   const hydration = activeHydration();
-  if (hydration !== null && !hydration.isFresh(el) || value == null) return;
+  const hydrating = hydration !== null && !hydration.isFresh(el);
+  const first = !ctrl.sawDC;
+  if (first) {
+    if (TRANSITION_JOURNAL !== null) {
+      journalObjectOnce(ctrl);
+      journalBag();
+    }
+    ctrl.sawDC = true;
+  }
+  if (hydrating) {
+    if (first) input.checked = input.checked;
+    return;
+  }
   if (ctrl.c !== -1) return;
-  const input = el;
+  if (first && !(DEFAULT_CHECKED_INITIALIZED in input)) {
+    if (TRANSITION_JOURNAL !== null) {
+      TRANSITION_JOURNAL.push(JOURNAL_PROP, input, "checked", input.checked);
+      if (input.type === "radio" && input.name !== "" && !!value) journalRadioCousins(input);
+    }
+    input.checked = value == null ? input.checked : !!value;
+  }
+  if (value == null) return;
   const b = !!value;
   if (input.defaultChecked !== b) {
     if (TRANSITION_JOURNAL !== null) {
@@ -11795,15 +11880,12 @@ function setFormControlSources(el, sources) {
   }
   const ctrl = armControlled(el);
   const first = !ctrl.formSeen;
-  const previousDefaultChecked = ctrl.formDefaultChecked;
   const previousMultiple = ctrl.formMultiple;
   if (TRANSITION_JOURNAL !== null) {
     journalObjectOnce(ctrl);
     journalBag();
   }
   ctrl.formSeen = true;
-  ctrl.formDefaultValue = defaultValue;
-  ctrl.formDefaultChecked = defaultChecked;
   if (process.env.NODE_ENV !== "production" && hasDevFormDiagnosticContext(el, CURRENT_SCOPE ?? void 0)) {
     const diagnostic = ensureDevFormDiagnosticState(el);
     diagnostic.authoringProps = { value, defaultValue, checked, defaultChecked, multiple };
@@ -11819,10 +11901,8 @@ function setFormControlSources(el, sources) {
       setDefaultValue(input, defaultString, first);
     }
     setChecked(input, checked);
-    if (checked == null && defaultChecked != null) setDefaultChecked(input, defaultChecked);
-    if (!first && defaultChecked == null && previousDefaultChecked !== UNCONTROLLED && previousDefaultChecked != null) {
-      input.defaultChecked = false;
-    }
+    if (checked == null && (defaultChecked != null || first))
+      setDefaultChecked(input, defaultChecked);
     return;
   }
   if (tag === "textarea") {
@@ -12015,10 +12095,10 @@ function restoreCheckedState(input, ctrl) {
 }
 function restoreRadioCousins(input) {
   const name = input.name;
-  const group = input.form !== null ? input.form.elements : typeof document !== "undefined" ? document.getElementsByName(name) : [];
+  const group = radioCousins(input);
   for (let i = 0; i < group.length; i++) {
     const other = group[i];
-    if (other === input || other.localName !== "input" || other.type !== "radio" || other.name !== name) {
+    if (other === input || other.localName !== "input" || other.type !== "radio" || other.name !== name || other.form !== input.form) {
       continue;
     }
     const octrl = other.$$ctrl;
@@ -13494,19 +13574,29 @@ function hasDangerHTML(props) {
 function hasHostPropContent(descriptor) {
   return hasDangerHTML(descriptor.props) || descriptor.type === "textarea" && (descriptor.props?.value != null || descriptor.props?.defaultValue != null);
 }
+function markInputCheckedness(input) {
+  input.checked = input.checked;
+  input[DEFAULT_CHECKED_INITIALIZED] = true;
+}
 function applyDeoptProps(el, props, ownerBlock) {
   if (props == null) {
+    if (el.localName === "input") markInputCheckedness(el);
     if (process.env.NODE_ENV !== "production") queueDevFormDiagnostic(el, ownerBlock);
     return;
   }
+  let needsCheckedInitialization = el.localName === "input";
   for (const name in props) {
     if (name === "key" || name === "children") continue;
     if (name === "suppressHydrationWarning") {
       el.__oct_suppress = props[name] === true;
       continue;
     }
-    applyDeoptProp(el, name, props[name], ownerBlock);
+    const value = props[name];
+    if (needsCheckedInitialization && (name === "defaultChecked" || name === "checked" && value != null))
+      needsCheckedInitialization = false;
+    applyDeoptProp(el, name, value, ownerBlock);
   }
+  if (needsCheckedInitialization) markInputCheckedness(el);
   if (process.env.NODE_ENV !== "production") queueDevFormDiagnostic(el, ownerBlock);
 }
 function patchDeoptProps(el, prevProps, nextProps, ownerBlock) {
@@ -13567,6 +13657,7 @@ function hostComponent(scope, slot, tag, props, childrenBody, anchor) {
 }
 function applyHostProps(el, props, scope, state) {
   const prev = state.props;
+  let needsCheckedInitialization = prev === void 0 && el.localName === "input";
   if (ROOT_RENDER_TRANSACTION !== null && prev !== props) journalObjectOnce(state);
   if (prev != null) {
     for (const k in prev) {
@@ -13584,12 +13675,15 @@ function applyHostProps(el, props, scope, state) {
   }
   state.props = props;
   if (props == null) {
+    if (needsCheckedInitialization) markInputCheckedness(el);
     if (process.env.NODE_ENV !== "production") queueDevFormDiagnostic(el, scope);
     return;
   }
   for (const name in props) {
     if (name === "key" || name === "children") continue;
     const v = props[name];
+    if (needsCheckedInitialization && (name === "defaultChecked" || name === "checked" && v != null))
+      needsCheckedInitialization = false;
     const actionName = formActionAttributeName(el, name);
     if (actionName !== null) {
       setFormAction(el, actionName, v, prev?.[name]);
@@ -13627,6 +13721,7 @@ function applyHostProps(el, props, scope, state) {
       }
     }
   }
+  if (needsCheckedInitialization) markInputCheckedness(el);
   if (process.env.NODE_ENV !== "production") queueDevFormDiagnostic(el, scope);
 }
 const DEOPT_DESC = /* @__PURE__ */ Symbol("octane.deoptDesc");