@sigil-dev/runtime 0.9.24 → 0.9.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.ts +19 -9
  2. package/package.json +1 -1
package/index.ts CHANGED
@@ -639,14 +639,21 @@ export function createMemo<T>(fn: () => T): Signal<T> {
639
639
  * or null to discard.
640
640
  */
641
641
  const lastItemFor = new WeakMap<object, unknown>();
642
+ /** The position a row was built at, for rows whose body reads the index. */
643
+ const lastIndexFor = new WeakMap<object, number>();
642
644
 
643
645
  export function reconcile<T>(
644
646
  anchor: Partial<Comment>,
645
647
  keyMap: Map<unknown, Node>,
646
648
  newItems: T[],
647
649
  getKey: (item: T, index: number) => unknown,
648
- createNode: (item: T) => Node,
649
- // is this meant to be unused? claimNode?: (element: Element, key: unknown) => Element | null,
650
+ createNode: (item: T, index: number) => Node,
651
+ /**
652
+ * The row body reads the index (`list.map((item, i) => …)`). Row bodies
653
+ * bake what they read at creation, so a row that moved is rebuilt to show
654
+ * its new position, the same way a row whose item changed is.
655
+ */
656
+ usesIndex = false,
650
657
  ): void {
651
658
  const newKeys = new Set(newItems.map((item, i) => getKey(item, i)));
652
659
 
@@ -668,16 +675,17 @@ export function reconcile<T>(
668
675
  let node = keyMap.get(key);
669
676
  if (
670
677
  node &&
671
- lastItemFor.has(node) &&
672
- !Object.is(lastItemFor.get(node), item)
678
+ ((lastItemFor.has(node) && !Object.is(lastItemFor.get(node), item)) ||
679
+ (usesIndex && lastIndexFor.get(node) !== i))
673
680
  ) {
674
681
  node.parentNode?.removeChild(node);
675
682
  keyMap.delete(key);
676
683
  node = undefined;
677
684
  }
678
685
  if (!node) {
679
- node = createNode(item);
686
+ node = createNode(item, i);
680
687
  lastItemFor.set(node, item);
688
+ lastIndexFor.set(node, i);
681
689
  keyMap.set(key, node);
682
690
  }
683
691
  anchor.before?.(node);
@@ -1073,8 +1081,9 @@ export function hydrateKeyedList<T>(
1073
1081
  nodesVar: ChildNode[],
1074
1082
  signalItems: T[],
1075
1083
  getKey: (item: T, index: number) => unknown,
1076
- createNode: (item: T) => Node,
1084
+ createNode: (item: T, index: number) => Node,
1077
1085
  parent?: Element,
1086
+ usesIndex = false,
1078
1087
  ): { anchor: Comment; keyMap: Map<unknown, Node> } {
1079
1088
  const keyMap = new Map<unknown, Node>();
1080
1089
  const isMarker = (n: ChildNode, data: string) =>
@@ -1084,7 +1093,7 @@ export function hydrateKeyedList<T>(
1084
1093
  if (start === -1) {
1085
1094
  // no server markup (client navigation): build the list fresh
1086
1095
  const anchor = claimComment(nodesVar, "g", parent);
1087
- reconcile(anchor, keyMap, signalItems, getKey, createNode);
1096
+ reconcile(anchor, keyMap, signalItems, getKey, createNode, usesIndex);
1088
1097
  return { anchor, keyMap };
1089
1098
  }
1090
1099
 
@@ -1098,8 +1107,9 @@ export function hydrateKeyedList<T>(
1098
1107
  );
1099
1108
  for (let i = 0; i < signalItems.length; i++) {
1100
1109
  const item = signalItems[i] as T;
1101
- const node = createNode(item);
1110
+ const node = createNode(item, i);
1102
1111
  lastItemFor.set(node, item);
1112
+ lastIndexFor.set(node, i);
1103
1113
  keyMap.set(getKey(item, i), node);
1104
1114
  }
1105
1115
  // rows the server rendered but the client has no item for
@@ -1112,7 +1122,7 @@ export function hydrateKeyedList<T>(
1112
1122
  ...all.slice(end + 1),
1113
1123
  );
1114
1124
 
1115
- reconcile(anchor, keyMap, signalItems, getKey, createNode);
1125
+ reconcile(anchor, keyMap, signalItems, getKey, createNode, usesIndex);
1116
1126
  return { anchor, keyMap };
1117
1127
  }
1118
1128
 
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@sigil-dev/runtime",
3
3
  "module": "index.ts",
4
4
  "type": "module",
5
- "version": "0.9.24",
5
+ "version": "0.9.25",
6
6
  "description": "Signals and fine-grained DOM updates for compiled Sigil components",
7
7
  "license": "MIT",
8
8
  "homepage": "https://sigil.cane1712.dev/docs/reference/runtime",