dara-core 1.25.0__py3-none-any.whl → 1.25.1__py3-none-any.whl

dara/core/_assets/auto_js/dara.core.umd.cjs

@@ -4227,7 +4227,7 @@
     let recoilValue = null;
     const {
       key,
-      get,
+      get: get2,
       cachePolicy_UNSTABLE: cachePolicy
     } = options;
     const set2 = options.set != null ? options.set : void 0;
@@ -4423,7 +4423,7 @@
         };
       };
       try {
-        result = get({
+        result = get2({
           get: getRecoilValue,
           getCallback
         });
@@ -5028,9 +5028,9 @@
     const sel = Recoil_selector({
       key: `${options.key}__withFallback`,
       get: ({
-        get
+        get: get2
       }) => {
-        const baseValue = get(base);
+        const baseValue = get2(base);
         return baseValue instanceof DefaultValue$2$1 ? options.default : baseValue;
       },
       // $FlowFixMe[incompatible-call]
@@ -5312,10 +5312,10 @@
   Recoil_selectorFamily({
     key: "__waitForNone",
     get: (dependencies) => ({
-      get
+      get: get2
     }) => {
       const deps = unwrapDependencies(dependencies);
-      const [results, exceptions] = concurrentRequests(get, deps);
+      const [results, exceptions] = concurrentRequests(get2, deps);
       return wrapLoadables(dependencies, results, exceptions);
     },
     dangerouslyAllowMutability: true
@@ -5323,10 +5323,10 @@
   Recoil_selectorFamily({
     key: "__waitForAny",
     get: (dependencies) => ({
-      get
+      get: get2
     }) => {
       const deps = unwrapDependencies(dependencies);
-      const [results, exceptions] = concurrentRequests(get, deps);
+      const [results, exceptions] = concurrentRequests(get2, deps);
       if (exceptions.some((exp) => !Recoil_isPromise(exp))) {
         return wrapLoadables(dependencies, results, exceptions);
       }
@@ -5350,10 +5350,10 @@
   Recoil_selectorFamily({
     key: "__waitForAll",
     get: (dependencies) => ({
-      get
+      get: get2
     }) => {
       const deps = unwrapDependencies(dependencies);
-      const [results, exceptions] = concurrentRequests(get, deps);
+      const [results, exceptions] = concurrentRequests(get2, deps);
       if (exceptions.every((exp) => exp == null)) {
         return wrapResults(dependencies, results);
       }
@@ -5368,10 +5368,10 @@
   Recoil_selectorFamily({
     key: "__waitForAllSettled",
     get: (dependencies) => ({
-      get
+      get: get2
     }) => {
       const deps = unwrapDependencies(dependencies);
-      const [results, exceptions] = concurrentRequests(get, deps);
+      const [results, exceptions] = concurrentRequests(get2, deps);
       if (exceptions.every((exp) => !Recoil_isPromise(exp))) {
         return wrapLoadables(dependencies, results, exceptions);
       }
@@ -5388,10 +5388,10 @@
   Recoil_selectorFamily({
     key: "__noWait",
     get: (dependency) => ({
-      get
+      get: get2
     }) => {
       try {
-        return Recoil_selector.value(loadableWithValue$4(get(dependency)));
+        return Recoil_selector.value(loadableWithValue$4(get2(dependency)));
       } catch (exception) {
         return Recoil_selector.value(Recoil_isPromise(exception) ? loadableWithPromise$3(exception) : loadableWithError$3(exception));
       }
@@ -6651,7 +6651,7 @@
         return cb(config$2);
       });
     },
-    get: function get() {
+    get: function get2() {
       return _config.cssPrefix;
     }
   });
@@ -13387,11 +13387,11 @@
     if (hasRequiredGet) return get_1;
     hasRequiredGet = 1;
     var baseGet = require_baseGet();
-    function get(object2, path, defaultValue) {
+    function get2(object2, path, defaultValue) {
       var result = object2 == null ? void 0 : baseGet(object2, path);
       return result === void 0 ? defaultValue : result;
     }
-    get_1 = get;
+    get_1 = get2;
     return get_1;
   }
   var _baseHasIn;
@@ -13447,14 +13447,14 @@
   function require_baseMatchesProperty() {
     if (hasRequired_baseMatchesProperty) return _baseMatchesProperty;
     hasRequired_baseMatchesProperty = 1;
-    var baseIsEqual = require_baseIsEqual(), get = requireGet(), hasIn = requireHasIn(), isKey = require_isKey(), isStrictComparable = require_isStrictComparable(), matchesStrictComparable = require_matchesStrictComparable(), toKey = require_toKey();
+    var baseIsEqual = require_baseIsEqual(), get2 = requireGet(), hasIn = requireHasIn(), isKey = require_isKey(), isStrictComparable = require_isStrictComparable(), matchesStrictComparable = require_matchesStrictComparable(), toKey = require_toKey();
     var COMPARE_PARTIAL_FLAG = 1, COMPARE_UNORDERED_FLAG = 2;
     function baseMatchesProperty(path, srcValue) {
       if (isKey(path) && isStrictComparable(srcValue)) {
         return matchesStrictComparable(toKey(path), srcValue);
       }
       return function(object2) {
-        var objValue = get(object2, path);
+        var objValue = get2(object2, path);
         return objValue === void 0 && objValue === srcValue ? hasIn(object2, path) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
       };
     }
@@ -28021,7 +28021,7 @@
     }
     var passive2 = false;
     var options = Object.defineProperty({}, "passive", {
-      get: function get() {
+      get: function get2() {
         passive2 = true;
       }
     });
@@ -33484,6 +33484,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    font-size: ${(props) => props.size ? `${props.size}rem` : "1rem"};
 `;
   const SelectedItem = styled.div`
     overflow: hidden;
@@ -34529,6 +34530,7 @@
 
     font-weight: ${(props) => (props === null || props === void 0 ? void 0 : props.heading) ? "bold" : "normal"};
     color: ${(props) => getTextColor(props === null || props === void 0 ? void 0 : props.heading, props.isSelected, props.theme)};
+    font-size: ${(props) => props.size ? `${props.size}rem` : "1rem"};
 
     ${(props) => {
     if (props.heading) {
@@ -34554,13 +34556,13 @@
       return [...acc, item];
     }, []);
   }
-  const SectionedListItem = ({ item, index: index2, getItemProps, isSelected, isHighlighted }) => {
+  const SectionedListItem = ({ item, index: index2, getItemProps, isSelected, isHighlighted, size: size2 }) => {
     const theme2 = useClTheme();
     const _a = getItemProps({ index: index2, item }), { itemClassName } = _a, itemProps = __rest$3(_a, ["itemClassName"]);
     if (item.heading) {
       delete itemProps.onClick;
     }
-    return jsxRuntimeExports.jsxs(ListItemSpan, Object.assign({}, itemProps, { heading: item.heading, section: item.section, isSelected, title: item.label, item, index: index2, isHighlighted, children: [item.label || item.section, item.badge && jsxRuntimeExports.jsx(Badge, { color: item.badge.color || theme2.colors.primary, children: item.badge.label })] }));
+    return jsxRuntimeExports.jsxs(ListItemSpan, Object.assign({}, itemProps, { heading: item.heading, section: item.section, isSelected, title: item.label, item, index: index2, size: size2, isHighlighted, children: [item.label || item.section, item.badge && jsxRuntimeExports.jsx(Badge, { color: item.badge.color || theme2.colors.primary, children: item.badge.label })] }));
   };
   function SectionedList(props) {
     var _a, _b, _c;
@@ -34652,8 +34654,8 @@
     const role = useRole(context, { role: "listbox" });
     const { getReferenceProps, getFloatingProps } = useInteractions([role]);
     const dropdownStyle = React$1.useMemo(() => Object.assign(Object.assign({}, floatingStyles), { marginLeft: -1 }), [floatingStyles]);
-    const renderListItem = React$1.useCallback((item, index2) => jsxRuntimeExports.jsx(SectionedListItem, { item, index: index2, getItemProps, isSelected: (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value) === item.value, isHighlighted: isOpen && kbdHighlightIdx !== void 0 && kbdHighlightIdx === index2 }, `item-${index2}-${isOpen && (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.label) === item.label}`), [getItemProps, selectedItem, isOpen, kbdHighlightIdx]);
-    return jsxRuntimeExports.jsxs(Wrapper$6, { className: props.className, isDisabled: props.disabled, isErrored: false, isOpen, style: props.style, id: props.id, children: [jsxRuntimeExports.jsxs(InputWrapper$2, { disabled: props.disabled, isOpen, ref: refs.setReference, children: [jsxRuntimeExports.jsx(Input, Object.assign({}, getInputProps({ value: inputValue }), getReferenceProps())), jsxRuntimeExports.jsx(ChevronButton$1, { disabled: props.disabled, isOpen, getToggleButtonProps })] }), ReactDOM.createPortal(jsxRuntimeExports.jsx(DropdownList$1, { items, getItemProps, getFloatingProps, style: dropdownStyle, isOpen, getMenuProps, ref: refs.setFloating, kbdHighlightIdx, children: renderListItem }), document.body)] });
+    const renderListItem = React$1.useCallback((item, index2) => jsxRuntimeExports.jsx(SectionedListItem, { item, index: index2, getItemProps, size: props.size, isSelected: (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value) === item.value, isHighlighted: isOpen && kbdHighlightIdx !== void 0 && kbdHighlightIdx === index2 }, `item-${index2}-${isOpen && (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.label) === item.label}`), [getItemProps, selectedItem, isOpen, kbdHighlightIdx, props.size]);
+    return jsxRuntimeExports.jsxs(Wrapper$6, { className: props.className, isDisabled: props.disabled, isErrored: false, isOpen, style: props.style, id: props.id, children: [jsxRuntimeExports.jsxs(InputWrapper$2, { disabled: props.disabled, isOpen, ref: refs.setReference, children: [jsxRuntimeExports.jsx(Input, Object.assign({}, getInputProps({ value: inputValue }), getReferenceProps(), { size: props.size })), jsxRuntimeExports.jsx(ChevronButton$1, { disabled: props.disabled, isOpen, getToggleButtonProps })] }), ReactDOM.createPortal(jsxRuntimeExports.jsx(DropdownList$1, { items, getItemProps, getFloatingProps, style: dropdownStyle, isOpen, size: props.size, getMenuProps, ref: refs.setFloating, kbdHighlightIdx, children: renderListItem }), document.body)] });
   }
   var toInteger_1;
   var hasRequiredToInteger;
@@ -39081,6 +39083,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       style: Object.assign(Object.assign(Object.assign({}, floatingStyles), { maxHeight: 800, minWidth: 150, zIndex: 9999 }), style)
     }), { isOpen, children: jsxRuntimeExports.jsx(SectionedList, { items: allowColumnHiding ? [resetFunctions, columnToggles] : [resetFunctions], onSelect: onOptionSelect }, isOpen ? "open" : "closed") })), document.body)] });
   };
+  const { fontSize } = window.getComputedStyle(document.documentElement);
+  const DEFAULT_ROW_HEIGHT = parseFloat(fontSize) * 2.5;
   var __rest$2 = function(s, e2) {
     var t2 = {};
     for (var p2 in s) if (Object.prototype.hasOwnProperty.call(s, p2) && e2.indexOf(p2) < 0)
@@ -39092,8 +39096,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
     return t2;
   };
-  const { fontSize } = window.getComputedStyle(document.documentElement);
-  const ROW_HEIGHT = parseFloat(fontSize) * 2.5;
   const shouldForwardProp$2 = (prop) => !["isSorted", "onClickRow"].includes(prop);
   const Row = styled.div.withConfig({ shouldForwardProp: shouldForwardProp$2 })`
     cursor: ${(props) => props.onClickRow ? "pointer" : "default"};
@@ -39149,7 +39151,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     align-items: center;
 
     min-width: 80px;
-    height: ${() => `${ROW_HEIGHT}px`};
+    height: ${({ rowHeight }) => `${rowHeight}px`};
 
     color: ${(props) => props.theme.colors.grey6};
 
@@ -39161,19 +39163,19 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
 `;
   const CellContent = styled.span`
-    overflow: hidden;
+    overflow: ${({ hasRowHeight }) => hasRowHeight ? "unset" : "hidden"};
 
     width: 100%;
     padding: 0 1rem;
 
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    text-overflow: ${({ hasRowHeight }) => hasRowHeight ? "unset" : "ellipsis"};
+    white-space: ${({ hasRowHeight }) => hasRowHeight ? "normal" : "nowrap"};
 `;
   const arePropsEqual = (prevProps, nextProps) => {
     var _a;
     return areEqual(prevProps, nextProps) && !(((_a = nextProps.data) === null || _a === void 0 ? void 0 : _a.headerGroups) || []).some((headerGroup) => ((headerGroup === null || headerGroup === void 0 ? void 0 : headerGroup.headers) || []).some((header) => header.isResizing));
   };
-  const RenderRow = React__namespace.memo(({ data: { width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns }, index: index2, style: renderRowStyle }) => {
+  const RenderRow = React__namespace.memo(({ data: { width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns, rowHeight }, index: index2, style: renderRowStyle }) => {
     let row = rows[index2];
     if (getItem) {
       const value = getItem(index2);
@@ -39186,8 +39188,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     if (!row) {
       return jsxRuntimeExports.jsx("div", { children: headerGroups.map((headerGroup, gidx) => jsxRuntimeExports.jsx(RowPlaceholder, { style: {
-        height: ROW_HEIGHT,
-        top: (index2 + 1) * ROW_HEIGHT,
+        height: rowHeight,
+        top: (index2 + 1) * rowHeight,
         width: totalColumnsWidth > width ? totalColumnsWidth : "100%"
       }, children: headerGroup === null || headerGroup === void 0 ? void 0 : headerGroup.headers.map((col, cidx) => {
         const headerProps = col.getHeaderProps();
@@ -39205,16 +39207,24 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
     };
     const _a = row.getRowProps({ style: renderRowStyle }), { style: rowStyle } = _a, restRow = __rest$2(_a, ["style"]);
-    return React$1.createElement(Row, Object.assign({}, restRow, { key: `row-${index2}`, onClick, onClickRow, style: Object.assign(Object.assign({}, rowStyle), { top: (index2 + 1) * ROW_HEIGHT, width: totalColumnsWidth > width ? totalColumnsWidth : "100%" }) }), row.cells.map((cell, colIdx) => {
-      var _a2;
+    return React$1.createElement(Row, Object.assign({}, restRow, { key: `row-${index2}`, onClick, onClickRow, style: Object.assign(Object.assign({}, rowStyle), {
+      // The first row is the header row which is not controlled by this rowHeight prop so it needs to be part of the calculation.
+      top: index2 === 0 ? DEFAULT_ROW_HEIGHT : index2 * rowHeight + DEFAULT_ROW_HEIGHT,
+      width: totalColumnsWidth > width ? totalColumnsWidth : "100%"
+    }) }), row.cells.map((cell, colIdx) => {
+      var _a2, _b, _c, _d, _e2;
       const cellProps = cell.getCellProps();
       return React$1.createElement(
         Cell,
-        Object.assign({}, cellProps, { key: `cell-${index2}-${colIdx}`, style: Object.assign(Object.assign({}, cellProps.style), { backgroundColor, justifyContent: mappedColumns[colIdx].align, maxWidth: (_a2 = cell.column) === null || _a2 === void 0 ? void 0 : _a2.maxWidth, width: (
+        Object.assign({}, cellProps, { rowHeight, key: `cell-${index2}-${colIdx}`, style: Object.assign(Object.assign(Object.assign(Object.assign({}, cellProps.style), { backgroundColor, justifyContent: mappedColumns[colIdx].align, maxWidth: (_a2 = cell.column) === null || _a2 === void 0 ? void 0 : _a2.maxWidth, width: (
           // If width calc has messed up then use the raw width from the column
           cellProps.style.width === "NaNpx" ? mappedColumns[colIdx].width : cellProps.style.width
-        ) }) }),
-        jsxRuntimeExports.jsx(CellContent, { children: cell.render("Cell", {
+        ) }), ((_b = mappedColumns[colIdx]) === null || _b === void 0 ? void 0 : _b.sticky) === "left" && typeof ((_c = mappedColumns[colIdx]) === null || _c === void 0 ? void 0 : _c.stickyOffset) === "number" ? {
+          left: `${mappedColumns[colIdx].stickyOffset}px`
+        } : {}), ((_d = mappedColumns[colIdx]) === null || _d === void 0 ? void 0 : _d.sticky) === "right" && typeof ((_e2 = mappedColumns[colIdx]) === null || _e2 === void 0 ? void 0 : _e2.stickyOffset) === "number" ? {
+          right: `${mappedColumns[colIdx].stickyOffset}px`
+        } : {}) }),
+        jsxRuntimeExports.jsx(CellContent, { hasRowHeight: rowHeight !== DEFAULT_ROW_HEIGHT, children: cell.render("Cell", {
           colIdx,
           currentEditCell,
           rowIdx: index2
@@ -39294,7 +39304,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     justify-content: space-between;
 
     min-width: 80px;
-    height: ${ROW_HEIGHT}px;
+    height: ${DEFAULT_ROW_HEIGHT}px;
 
     color: ${(props) => props.theme.colors.text};
 
@@ -39379,6 +39389,26 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     });
     return [...leftStickyCols, ...nonStickyCols, ...rightStickyCols];
   };
+  const appendStickyOffsets = (columns) => {
+    let leftOffset = 0;
+    let rightOffset = 0;
+    const rightStickyColumnWidths = columns.filter((col) => col.sticky === "right").slice(1).map((col) => parseInt(col.width) || 150);
+    return columns.map((col) => {
+      if (col.sticky === "left") {
+        const nextCol = Object.assign(Object.assign({}, col), { stickyOffset: leftOffset });
+        const width = parseInt(col.width) || 150;
+        leftOffset += width;
+        return nextCol;
+      }
+      if (col.sticky === "right") {
+        rightOffset = rightStickyColumnWidths.reduce((acc, width) => acc + width, 0);
+        const nextCol = Object.assign(Object.assign({}, col), { stickyOffset: rightOffset });
+        rightStickyColumnWidths.shift();
+        return nextCol;
+      }
+      return col;
+    });
+  };
   const filterComponentMap = {
     categorical: CategoricalFilter,
     datetime: DatetimeFilter,
@@ -39396,12 +39426,26 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return Object.assign(Object.assign({}, col), { Filter: filterComponentMap[col.filter] });
     });
   };
+  const createActionColumn = (actions, accessor, sticky, disableSelectAll = false) => {
+    const width = actions.includes(Actions.SELECT) ? 52 : actions.length * 24 + 24;
+    return {
+      Cell: ActionCell,
+      Header: actions.includes(Actions.SELECT) && !disableSelectAll ? SelectHeader : "",
+      accessor: accessor || "actions",
+      actions,
+      disableSortBy: true,
+      maxWidth: width,
+      minWidth: actions.includes(Actions.SELECT) ? 52 : 48,
+      sticky: sticky || null,
+      width
+    };
+  };
   const cells = {
     DATETIME: DatetimeCell,
     EDIT_INPUT: EditInputCell,
     EDIT_SELECT: EditSelectCell
   };
-  const createItemData$1 = memoizeOne$1((width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns) => ({
+  const createItemData$1 = memoizeOne$1((width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns, rowHeight) => ({
     backgroundColor,
     currentEditCell,
     getItem,
@@ -39410,12 +39454,14 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     onClickRow,
     prepareRow,
     rows,
+    rowHeight,
     throttledClickRow,
     totalColumnsWidth,
     width
   }));
-  const Table = React$1.forwardRef(({ allowHiding, backgroundColor, className, columns, data: data2, getItem, initialSort = [], itemCount, maxRows, onAction, onChange: onChange2, onClickRow, onItemsRendered, onFilter, onSort, showTableOptions, style, tableOptionsStyle }, ref) => {
+  const Table = React$1.forwardRef(({ allowHiding, actions, backgroundColor, className, columns, data: data2, getItem, initialSort = [], itemCount, maxRows, onAction, onChange: onChange2, onClickRow, onItemsRendered, onFilter, onSort, rowHeight, showTableOptions, style, tableOptionsStyle }, ref) => {
     const [currentSortBy, setCurrentSortBy] = React$1.useState(initialSort);
+    const tableRowHeight = rowHeight || DEFAULT_ROW_HEIGHT;
     React$1.useEffect(
       () => {
         setCurrentSortBy(initialSort);
@@ -39445,7 +39491,14 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       throttledSetEditCell([Number(cell[0]), cell[1]]);
     };
     const infiniteData = React$1.useMemo(() => Array(itemCount).fill(0), [itemCount]);
-    const mappedColumns = React$1.useMemo(() => appendFilterComponents(orderStickyCols(columns)), [columns]);
+    const mappedColumns = React$1.useMemo(() => {
+      let processedColumns = columns;
+      if (actions && actions.length > 0) {
+        const actionColumn = createActionColumn(actions);
+        processedColumns = [...columns, actionColumn];
+      }
+      return appendStickyOffsets(appendFilterComponents(orderStickyCols(processedColumns)));
+    }, [columns, actions]);
     const hasFixedColumns = React$1.useMemo(() => mappedColumns.some((column) => "sticky" in column), [mappedColumns]);
     const totalColumnsWidth = React$1.useMemo(() => mappedColumns.reduce((acc, column) => acc + (parseInt(column.width) || 150), 0), [mappedColumns]);
     const filterTypes = React$1.useMemo(() => ({
@@ -39501,11 +39554,15 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           const showHeaderCellButtonContainer = showSort || showFilter || showOptions;
           return React$1.createElement(
             HeaderCell,
-            Object.assign({}, headerProps, { key: `col-${gidx}-${cidx}`, style: Object.assign(Object.assign({}, headerProps.style), {
+            Object.assign({}, headerProps, { key: `col-${gidx}-${cidx}`, style: Object.assign(Object.assign(Object.assign(Object.assign({}, headerProps.style), {
               maxWidth: col.maxWidth,
               // If width calc has messed up then use the raw width from the column
               width: headerProps.style.width === "NaNpx" ? mappedColumns[cidx].width : headerProps.style.width
-            }) }),
+            }), col.sticky === "left" && typeof col.stickyOffset === "number" ? {
+              left: `${col.stickyOffset}px`
+            } : {}), col.sticky === "right" && typeof col.stickyOffset === "number" ? {
+              right: `${col.stickyOffset}px`
+            } : {}) }),
             jsxRuntimeExports.jsxs(HeaderTooltipContainer, { isPrimitiveHeader: typeof headerContent === "string", children: [jsxRuntimeExports.jsx(HeaderContentWrapper, Object.assign({}, sortProps, { isPrimitiveHeader: typeof headerContent === "string", title: typeof headerContent === "string" ? headerContent : "", children: headerContent })), col.tooltip && jsxRuntimeExports.jsx(Tooltip, { content: col.tooltip, children: jsxRuntimeExports.jsx(TooltipIcon, { icon: faCircleQuestion }) })] }),
             showHeaderCellButtonContainer && jsxRuntimeExports.jsxs(HeaderCellButtonContainer, { children: [jsxRuntimeExports.jsxs(HeaderIconsWrapper, { children: [showSort && jsxRuntimeExports.jsx(HeaderIconWrapper, { children: jsxRuntimeExports.jsx(SortIcon, Object.assign({}, sortProps, { className: "tableSortArrow", icon: getSortIcon(col.isSorted, col.isSortedDesc), isSorted: col.isSorted })) }), showFilter ? jsxRuntimeExports.jsx(FilterContainer, { col }) : null, showOptions && jsxRuntimeExports.jsx(OptionsMenu, { allColumns, allowColumnHiding: allowHiding, numVisibleColumns, resetResizing, setAllFilters, style: tableOptionsStyle })] }), jsxRuntimeExports.jsx(ResizeBorder, Object.assign({}, resizerProps))] })
           );
@@ -39514,28 +39571,15 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       // eslint-disable-next-line react-hooks/exhaustive-deps
       useDeepCompare([tableProps, totalColumnsWidth, headerGroups])
     );
-    return jsxRuntimeExports.jsx(Wrapper$2, Object.assign({}, getTableProps(), { "$hasMaxRows": !!maxRows, className: `${className} ${hasFixedColumns ? "sticky" : ""}`, style: Object.assign({ height: maxRows ? (Math.min(rows.length, maxRows) + 1) * ROW_HEIGHT : "100%" }, style), children: jsxRuntimeExports.jsx(AutoSizer, { children: ({ height, width }) => {
-      return jsxRuntimeExports.jsx(StyledFixedSizeList, { height, innerElementType: renderTable, itemCount: itemCount || rows.length, itemData: createItemData$1(width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns), itemSize: ROW_HEIGHT, onItemsRendered, style: {
+    return jsxRuntimeExports.jsx(Wrapper$2, Object.assign({}, getTableProps(), { "$hasMaxRows": !!maxRows, className: `${className} ${hasFixedColumns ? "sticky" : ""}`, style: Object.assign({ height: maxRows ? (Math.min(rows.length, maxRows) + 1) * tableRowHeight : "100%" }, style), children: jsxRuntimeExports.jsx(AutoSizer, { children: ({ height, width }) => {
+      return jsxRuntimeExports.jsx(StyledFixedSizeList, { height, innerElementType: renderTable, itemCount: itemCount || rows.length, itemData: createItemData$1(width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns, tableRowHeight), itemSize: tableRowHeight, onItemsRendered, style: {
         overflowX: width < totalColumnsWidth ? "auto" : "hidden",
-        overflowY: height < (rows.length + 1) * ROW_HEIGHT ? "auto" : "hidden"
+        overflowY: height < (rows.length + 1) * tableRowHeight ? "auto" : "hidden"
       }, width, children: RenderRow }, "table-list");
     } }) }));
   });
   Table.displayName = "Table";
-  Table.ActionColumn = (actions, accessor, sticky, disableSelectAll = false) => {
-    const width = actions.includes(Actions.SELECT) ? 52 : actions.length * 24 + 24;
-    return {
-      Cell: ActionCell,
-      Header: actions.includes(Actions.SELECT) && !disableSelectAll ? SelectHeader : "",
-      accessor: accessor || "actions",
-      actions,
-      disableSortBy: true,
-      maxWidth: width,
-      minWidth: actions.includes(Actions.SELECT) ? 52 : 48,
-      sticky: sticky || null,
-      width
-    };
-  };
+  Table.ActionColumn = createActionColumn;
   Table.Actions = Actions;
   Table.cells = cells;
   styled.div`
@@ -45171,7 +45215,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           function baseAt(object2, paths) {
             var index2 = -1, length = paths.length, result2 = Array2(length), skip = object2 == null;
             while (++index2 < length) {
-              result2[index2] = skip ? undefined$1 : get(object2, paths[index2]);
+              result2[index2] = skip ? undefined$1 : get2(object2, paths[index2]);
             }
             return result2;
           }
@@ -45616,7 +45660,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
               return matchesStrictComparable(toKey(path), srcValue);
             }
             return function(object2) {
-              var objValue = get(object2, path);
+              var objValue = get2(object2, path);
               return objValue === undefined$1 && objValue === srcValue ? hasIn(object2, path) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
             };
           }
@@ -48371,7 +48415,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           function functionsIn(object2) {
             return object2 == null ? [] : baseFunctions(object2, keysIn(object2));
           }
-          function get(object2, path, defaultValue) {
+          function get2(object2, path, defaultValue) {
             var result2 = object2 == null ? undefined$1 : baseGet(object2, path);
             return result2 === undefined$1 ? defaultValue : result2;
           }
@@ -49229,7 +49273,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           lodash2.forInRight = forInRight;
           lodash2.forOwn = forOwn;
           lodash2.forOwnRight = forOwnRight;
-          lodash2.get = get;
+          lodash2.get = get2;
           lodash2.gt = gt2;
           lodash2.gte = gte;
           lodash2.has = has;
@@ -50930,12 +50974,22 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     await validateResponse(res, `Failed to cancel task with id: ${taskId}`);
     return true;
   }
+  function serializeNestedKey$1(key) {
+    if (typeof key === "string") {
+      return key;
+    }
+    if (isLoopVariable(key)) {
+      const loopNested = key.nested.join(",");
+      return `LoopVar:${key.uid}:${loopNested}`;
+    }
+    return String(key);
+  }
   function getUniqueIdentifier(variable, opts = {
     useNested: true
   }) {
     let identifier = variable.uid;
     if (opts.useNested && "nested" in variable) {
-      identifier += variable.nested.join(",");
+      identifier += variable.nested.map(serializeNestedKey$1).join(",");
     }
     return identifier;
   }
@@ -64524,22 +64578,15 @@ ${String(error)}`;
         selectorFamilyRegistry.set(
           key,
           Recoil_index_11({
-            get: (currentExtras) => ({ get }) => {
-              const variableValue = get(family(currentExtras));
-              return resolveNested(
-                variableValue,
-                variable.nested.map((n2) => String(n2))
-              );
+            get: (currentExtras) => ({ get: get2 }) => {
+              const variableValue = get2(family(currentExtras));
+              return resolveNested(variableValue, variable.nested);
             },
             key,
             set: (currentExtras) => ({ set: set2 }, newValue) => {
               set2(
                 family(currentExtras),
-                (v) => setNested(
-                  v,
-                  variable.nested.map((n2) => String(n2)),
-                  newValue
-                )
+                (v) => setNested(v, variable.nested, newValue)
               );
             }
           })
@@ -64570,10 +64617,20 @@ ${String(error)}`;
   function isPlaceholder(value) {
     return typeof value === "object" && "__ref" in value;
   }
+  function serializeNestedKey(key) {
+    if (typeof key === "string") {
+      return key;
+    }
+    if (isLoopVariable(key)) {
+      const loopNested = key.nested.join(",");
+      return `LoopVar:${key.uid}:${loopNested}`;
+    }
+    return String(key);
+  }
   function getIdentifier$1(variable) {
     let id = `${variable.__typename}:${variable.uid}`;
     if ("nested" in variable && variable.nested.length > 0) {
-      id += `:${variable.nested.join(",")}`;
+      id += `:${variable.nested.map(serializeNestedKey).join(",")}`;
     }
     return id;
   }
@@ -69825,7 +69882,7 @@ ${String(error)}`;
           cachePolicy_UNSTABLE: {
             eviction: "most-recent"
           },
-          get: (extrasSerializable) => async ({ get }) => {
+          get: (extrasSerializable) => async ({ get: get2 }) => {
             const resolvedVariables = await Promise.all(
               variable.variables.map(async (v) => {
                 if (!isVariable(v)) {
@@ -69834,17 +69891,17 @@ ${String(error)}`;
                 return resolveVariable(v, wsClient, taskContext, extrasSerializable.extras);
               })
             );
-            const selfTrigger = get(getOrRegisterTrigger(variable));
+            const selfTrigger = get2(getOrRegisterTrigger(variable));
             const selectorKey = key + extrasSerializable.toJSON();
             const triggerList = buildTriggerList(variable.variables);
-            const triggers = registerChildTriggers(triggerList, get);
+            const triggers = registerChildTriggers(triggerList, get2);
             triggers.unshift(selfTrigger);
             const derivedResult = resolveDerivedValue({
               key: selectorKey,
               variables: variable.variables,
               deps: variable.deps,
               resolvedVariables,
-              resolutionStrategy: { name: "get", get },
+              resolutionStrategy: { name: "get", get: get2 },
               triggerList,
               triggers
             });
@@ -69874,7 +69931,7 @@ ${String(error)}`;
           cachePolicy_UNSTABLE: {
             eviction: "most-recent"
           },
-          get: (extrasSerializable) => async ({ get }) => {
+          get: (extrasSerializable) => async ({ get: get2 }) => {
             const selectorKey = key + extrasSerializable.toJSON();
             const throwError = (error) => {
               error.selectorId = key;
@@ -69894,7 +69951,7 @@ ${String(error)}`;
               taskContext,
               extrasSerializable.extras
             );
-            let derivedResult = get(dvResultSelector);
+            let derivedResult = get2(dvResultSelector);
             if (derivedResult.type === "previous") {
               return derivedResult.entry.result;
             }
@@ -69991,14 +70048,14 @@ ${String(error)}`;
       selectorFamilyRegistry.set(
         key,
         Recoil_index_11({
-          get: (extrasSerializable) => ({ get }) => {
+          get: (extrasSerializable) => ({ get: get2 }) => {
             const dvSelector = getOrRegisterDerivedVariableValue(
               variable,
               wsClient,
               taskContext,
               extrasSerializable.extras
             );
-            const value = get(dvSelector);
+            const value = get2(dvSelector);
             return "nested" in variable ? resolveNested(value, variable.nested) : value;
           },
           key: nanoid$1()
@@ -70890,12 +70947,12 @@ ${String(error)}`;
     unescapePathComponent
   });
   var getExports = requireGet();
-  const getPath = /* @__PURE__ */ getDefaultExportFromCjs(getExports);
+  const get = /* @__PURE__ */ getDefaultExportFromCjs(getExports);
   function extractKey(item, keyAccessor) {
     if (item === null || item === void 0) {
       return void 0;
     }
-    const key = getPath(item, keyAccessor);
+    const key = get(item, keyAccessor);
     if (typeof key === "string" || typeof key === "number") {
       return key;
     }
@@ -71187,7 +71244,7 @@ ${String(error)}`;
         key,
         Recoil_index_11({
           key: nanoid$1(),
-          get: (extrasSerializable) => async ({ get }) => {
+          get: (extrasSerializable) => async ({ get: get2 }) => {
             const resolvedVariables = await Promise.all(
               variable.variables.map(async (v) => {
                 if (!isVariable(v)) {
@@ -71197,8 +71254,8 @@ ${String(error)}`;
               })
             );
             const triggerList = buildTriggerList(variable.variables);
-            registerChildTriggers(triggerList, get);
-            const resolvedValues = resolvedVariables.map((v) => resolveValue(v, get));
+            registerChildTriggers(triggerList, get2);
+            const resolvedValues = resolvedVariables.map((v) => resolveValue(v, get2));
             const params = {
               uid: variable.uid,
               resolvedValues,
@@ -71227,19 +71284,19 @@ ${String(error)}`;
         key,
         Recoil_index_11({
           key: nanoid$1(),
-          get: (extrasSerializable) => ({ get }) => {
+          get: (extrasSerializable) => ({ get: get2 }) => {
             const paramsSelector = getOrRegisterStreamVariableParams(
               variable,
               client2,
               taskContext,
               extrasSerializable.extras
             );
-            const atomKey = get(paramsSelector);
+            const atomKey = get2(paramsSelector);
             const atom2 = streamAtomFamily(atomKey);
             if (!streamAtomRegistry.has(atomKey)) {
               streamAtomRegistry.set(atomKey, atom2);
             }
-            const streamState = get(atom2);
+            const streamState = get2(atom2);
             return getStreamValue(streamState, variable.key_accessor);
           }
         })
@@ -71261,14 +71318,14 @@ ${String(error)}`;
         key,
         Recoil_index_11({
           key: nanoid$1(),
-          get: (extrasSerializable) => ({ get }) => {
+          get: (extrasSerializable) => ({ get: get2 }) => {
             const valueSelector = getOrRegisterStreamVariableValue(
               variable,
               client2,
               taskContext,
               extrasSerializable.extras
             );
-            const value = get(valueSelector);
+            const value = get2(valueSelector);
             return "nested" in variable ? resolveNested(value, variable.nested) : value;
           }
         })
@@ -71307,10 +71364,11 @@ ${String(error)}`;
     }
     let returnVal = obj;
     for (const key of nested) {
-      if (!Object.keys(returnVal).includes(key)) {
+      const stringKey = key;
+      if (!Object.keys(returnVal).includes(stringKey)) {
         return null;
       }
-      returnVal = returnVal[key];
+      returnVal = returnVal[stringKey];
     }
     return returnVal;
   }
@@ -71347,6 +71405,7 @@ ${String(error)}`;
         type: "derived",
         uid: variable.uid,
         values,
+        // After templating, nested should be all strings
         nested: variable.nested
       };
     }
@@ -71391,6 +71450,7 @@ ${String(error)}`;
         type: "derived",
         uid: variable.uid,
         values,
+        // After templating, nested should be all strings
         nested: variable.nested
       };
     }
@@ -72444,7 +72504,7 @@ Inferred class string: "${iconClasses}."`
           cachePolicy_UNSTABLE: {
             eviction: "most-recent"
           },
-          get: (extrasSerializable) => async ({ get }) => {
+          get: (extrasSerializable) => async ({ get: get2 }) => {
             const throwError = (error) => {
               error.selectorId = key;
               error.selectorExtras = extrasSerializable.toJSON();
@@ -72466,9 +72526,9 @@ Inferred class string: "${iconClasses}."`
             const resolvedKwargsList = Object.values(resolvedKwargs);
             const kwargsList = Object.values(dynamicKwargs);
             const triggerAtom = getOrRegisterComponentTrigger(uid2, loop_instance_uid);
-            const selfTrigger = get(triggerAtom);
+            const selfTrigger = get2(triggerAtom);
             const triggerList = buildTriggerList(kwargsList);
-            const triggers = registerChildTriggers(triggerList, get);
+            const triggers = registerChildTriggers(triggerList, get2);
             triggers.unshift(selfTrigger);
             const { extras } = extrasSerializable;
             let derivedResult = resolveDerivedValue({
@@ -72476,7 +72536,7 @@ Inferred class string: "${iconClasses}."`
               variables: kwargsList,
               deps: kwargsList,
               resolvedVariables: resolvedKwargsList,
-              resolutionStrategy: { name: "get", get },
+              resolutionStrategy: { name: "get", get: get2 },
               triggerList,
               triggers
             });
@@ -72768,6 +72828,9 @@ Inferred class string: "${iconClasses}."`
   }
   var isPlainObjectExports = requireIsPlainObject();
   const isPlainObject = /* @__PURE__ */ getDefaultExportFromCjs(isPlainObjectExports);
+  function isVariableWithNested(value) {
+    return value && typeof value === "object" && "__typename" in value && typeof value.__typename === "string" && value.__typename.includes("Variable") && "nested" in value && Array.isArray(value.nested);
+  }
   function createMarkers(scope, loopInstanceUid) {
     const markers = [];
     if (scope.action) {
@@ -72807,6 +72870,33 @@ Inferred class string: "${iconClasses}."`
           );
           continue;
         }
+        if (isVariableWithNested(value) && !isLoopVariable(value)) {
+          for (let i2 = 0; i2 < value.nested.length; i2++) {
+            const nestedKey = value.nested[i2];
+            if (isLoopVariable(nestedKey)) {
+              markers.push({
+                type: "nested_loop_var",
+                path: dotPath,
+                nestedIndex: i2,
+                loopVarNested: nestedKey.nested
+              });
+              if (isDerivedVariable(value)) {
+                markers.push({
+                  type: "derived_var",
+                  path: dotPath,
+                  loopInstanceUid: nestedKey.uid
+                });
+              }
+              if (isPyComponent(value)) {
+                markers.push({
+                  type: "server_component",
+                  path: dotPath,
+                  loopInstanceUid: nestedKey.uid
+                });
+              }
+            }
+          }
+        }
         if (isPlainObject(value) || Array.isArray(value)) {
           const newScope = updateScope(scope, value, dotPath);
           walk(value, [...pathSegments, key], newScope);
@@ -72847,6 +72937,14 @@ Inferred class string: "${iconClasses}."`
           set(clonedRenderer, marker.path, value);
           break;
         }
+        case "nested_loop_var": {
+          const resolvedKey = resolveNested(loopValue, marker.loopVarNested);
+          const variable = get(clonedRenderer, marker.path);
+          if (variable && Array.isArray(variable.nested)) {
+            variable.nested[marker.nestedIndex] = String(resolvedKey);
+          }
+          break;
+        }
         case "action": {
           set(clonedRenderer, `${marker.path}.loading.uid`, nanoid$1());
           break;

dara/core/interactivity/derived_variable.py

@@ -22,6 +22,7 @@ import uuid
 from collections.abc import Awaitable, Callable
 from inspect import Parameter, signature
 from typing import (
+    TYPE_CHECKING,
     Any,
     Generic,
     Protocol,
@@ -41,6 +42,15 @@ from pydantic import (
 )
 from typing_extensions import TypedDict, TypeVar, runtime_checkable
 
+if TYPE_CHECKING:
+    from dara.core.interactivity.loop_variable import LoopVariable
+
+    # Type alias for static type checking
+    NestedKey = str | LoopVariable
+else:
+    # At runtime, use Any to avoid forward reference issues with Pydantic
+    NestedKey = Any
+
 from dara.core.base_definitions import (
     BaseCachePolicy,
     BaseTask,
@@ -172,7 +182,7 @@ class DerivedVariable(ClientVariable, Generic[VariableType]):
     variables: list[AnyVariable]
     polling_interval: int | None
     deps: list[AnyVariable] | None = Field(validate_default=True)
-    nested: list[str] = Field(default_factory=list)
+    nested: list[NestedKey] = Field(default_factory=list)
     uid: str
     model_config = ConfigDict(extra='forbid', use_enum_values=True, arbitrary_types_allowed=True)
 
@@ -185,7 +195,7 @@ class DerivedVariable(ClientVariable, Generic[VariableType]):
         polling_interval: int | None = None,
         deps: list[AnyVariable] | None = None,
         uid: str | None = None,
-        nested: list[str] | None = None,
+        nested: list[NestedKey] | None = None,
         filter_resolver: FilterResolver | None = None,
         **kwargs,
     ):
@@ -271,7 +281,14 @@ class DerivedVariable(ClientVariable, Generic[VariableType]):
 
         return deps
 
-    def get(self, key: str):
+    def get(self, key: NestedKey):
+        """
+        Create a copy of this DerivedVariable that points to a nested key.
+
+        The key can be a string or a LoopVariable for dynamic access within a For loop.
+
+        :param key: the key to access; can be a string or LoopVariable
+        """
         return self.model_copy(update={'nested': [*self.nested, key]}, deep=True)
 
     def trigger(self, force: bool = True):

dara/core/interactivity/plain_variable.py

@@ -21,7 +21,7 @@ import warnings
 from collections.abc import Callable
 from contextlib import contextmanager
 from contextvars import ContextVar
-from typing import Any, Generic
+from typing import TYPE_CHECKING, Any, Generic
 
 from fastapi.encoders import jsonable_encoder
 from pydantic import (
@@ -40,6 +40,15 @@ from dara.core.internal.utils import call_async
 from dara.core.logging import dev_logger
 from dara.core.persistence import BackendStore, BrowserStore, PersistenceStore
 
+if TYPE_CHECKING:
+    from dara.core.interactivity.loop_variable import LoopVariable
+
+    # Type alias for static type checking
+    NestedKey = str | LoopVariable
+else:
+    # At runtime, use Any to avoid forward reference issues with Pydantic
+    NestedKey = Any
+
 VARIABLE_INIT_OVERRIDE = ContextVar[Callable[[dict], dict] | None]('VARIABLE_INIT_OVERRIDE', default=None)
 
 VariableType = TypeVar('VariableType')
@@ -56,7 +65,7 @@ class Variable(ClientVariable, Generic[VariableType, PersistenceStoreType_co]):
     default: VariableType | None = None
     store: SerializeAsAny[PersistenceStoreType_co | None] = None
     uid: str
-    nested: list[str] = Field(default_factory=list)
+    nested: list[NestedKey] = Field(default_factory=list)
     model_config = ConfigDict(extra='forbid')
 
     def __init__(
@@ -65,7 +74,7 @@ class Variable(ClientVariable, Generic[VariableType, PersistenceStoreType_co]):
         persist_value: bool | None = False,
         uid: str | None = None,
         store: PersistenceStoreType_co | None = None,
-        nested: list[str] | None = None,
+        nested: list[NestedKey] | None = None,
         **kwargs,
     ):
         """
@@ -144,11 +153,13 @@ class Variable(ClientVariable, Generic[VariableType, PersistenceStoreType_co]):
         yield
         VARIABLE_INIT_OVERRIDE.reset(token)
 
-    def get(self, key: str):
+    def get(self, key: NestedKey):
         """
         Create a copy of this Variable that points to a nested key. This is useful when
         storing e.g. a dictionary in a Variable and wanting to access a specific key.
 
+        The key can be a string or a LoopVariable for dynamic access within a For loop.
+
         ```python
         from dara.core import Variable, UpdateVariable
         from dara_dashboarding_extension import Input, Text, Stack, Button
@@ -177,7 +188,11 @@ class Variable(ClientVariable, Generic[VariableType, PersistenceStoreType_co]):
             )
         )
 
-        :param key: the key to access; must be a string
+        # Dynamic access using LoopVariable
+        items = Variable([{'id': 'a'}, {'id': 'b'}])
+        For(items=items, renderer=Input(value=state.get(items.list_item.get('id'))))
+
+        :param key: the key to access; can be a string or LoopVariable
         ```
         """
         return self.model_copy(update={'nested': [*self.nested, key]}, deep=True)

dara/core/interactivity/stream_variable.py

@@ -21,12 +21,21 @@ import asyncio
 import contextlib
 from collections.abc import AsyncGenerator, Callable
 from dataclasses import dataclass
-from typing import Any, Generic, Literal
+from typing import TYPE_CHECKING, Any, Generic, Literal
 
 from fastapi import Request
 from pydantic import ConfigDict, Field, SerializerFunctionWrapHandler, field_validator, model_serializer
 from typing_extensions import TypeVar
 
+if TYPE_CHECKING:
+    from dara.core.interactivity.loop_variable import LoopVariable
+
+    # Type alias for static type checking
+    NestedKey = str | LoopVariable
+else:
+    # At runtime, use Any to avoid forward reference issues with Pydantic
+    NestedKey = Any
+
 from dara.core.base_definitions import BaseTask
 from dara.core.interactivity.any_variable import AnyVariable
 from dara.core.interactivity.client_variable import ClientVariable
@@ -119,7 +128,7 @@ class StreamVariable(ClientVariable, Generic[VariableType]):
     uid: str
     variables: list[AnyVariable] = Field(default_factory=list)
     key_accessor: str | None = None
-    nested: list[str] = Field(default_factory=list)
+    nested: list[NestedKey] = Field(default_factory=list)
 
     model_config = ConfigDict(extra='forbid')
 
@@ -160,7 +169,7 @@ class StreamVariable(ClientVariable, Generic[VariableType]):
         variables: list[AnyVariable] | None = None,
         key_accessor: str | None = None,
         uid: str | None = None,
-        nested: list[str] | None = None,
+        nested: list[NestedKey] | None = None,
         **kwargs,
     ):
         """
@@ -201,13 +210,15 @@ class StreamVariable(ClientVariable, Generic[VariableType]):
             ),
         )
 
-    def get(self, *keys: str) -> StreamVariable[Any]:
+    def get(self, *keys: NestedKey) -> StreamVariable[Any]:
         """
         Access a nested value within the stream's accumulated state.
 
         This is useful when the stream accumulates complex state (via snapshot/patch)
         and you want to access a specific part of it.
 
+        Keys can be strings or LoopVariables for dynamic access within a For loop.
+
         Example::
 
             dashboard = StreamVariable(dashboard_stream, variables=[id_var])
@@ -215,11 +226,20 @@ class StreamVariable(ClientVariable, Generic[VariableType]):
             # Access nested value
             Text(dashboard.get('meta', 'count'))
 
+            # Dynamic access using LoopVariable
+            items = Variable([{'id': 'a'}, {'id': 'b'}])
+            For(items=items, renderer=Text(dashboard.get(items.list_item.get('id'))))
+
         :param keys: One or more keys to traverse into the nested structure.
+                    Can be strings or LoopVariables.
         :return: A new StreamVariable pointing to the nested path.
         """
+        from dara.core.interactivity.loop_variable import LoopVariable
+
+        # Preserve LoopVariables as-is, convert other types to strings
+        processed_keys: list[NestedKey] = [k if isinstance(k, LoopVariable) else str(k) for k in keys]
         return self.model_copy(
-            update={'nested': [*self.nested, *[str(k) for k in keys]]},
+            update={'nested': [*self.nested, *processed_keys]},
             deep=True,
         )
 

dara/core/internal/dependency_resolution.py

@@ -17,6 +17,7 @@ limitations under the License.
 
 from typing import Any, Literal, TypeGuard
 
+from pydantic import BaseModel
 from typing_extensions import TypedDict
 
 from dara.core.base_definitions import BaseTask, PendingTask
@@ -75,16 +76,27 @@ def _resolve_nested(value: Any, nested: list[str] | None) -> Any:
     if not nested or len(nested) == 0:
         return value
 
-    # Not a dict (equivalent to frontend's object check)
-    if value is None or not isinstance(value, dict):
+    # Not a dict/model
+    if value is None or not isinstance(value, (dict, BaseModel)):
         return value
 
     result = value
     for key in nested:
-        # If the key doesn't exist, return None as we're referring to a path which doesn't exist yet
-        if not isinstance(result, dict) or key not in result:
-            return None
-        result = result[key]
+        # Defensive check: LoopVariable should have been resolved by frontend templating
+        if isinstance(key, dict):
+            raise ValueError(
+                'LoopVariable found in nested path during backend resolution. '
+                'This should have been resolved by frontend templating.'
+            )
+        # Can recurse into a dict or a pydantic model
+        if isinstance(result, dict):
+            # Path does not exist, resolve to None
+            if key not in result:
+                return None
+            result = result[key]
+        elif isinstance(result, BaseModel):
+            # fall back to None, if key doesn't exist/is None, we'll skip iterating anyway
+            result = getattr(result, key, None)
 
     return result
 

dara/core/internal/normalization.py

@@ -21,7 +21,6 @@ from typing import (
     Generic,
     TypeGuard,
     TypeVar,
-    cast,
     overload,
 )
 
@@ -57,13 +56,26 @@ class Referrable(TypedDict):
 
 
 class ReferrableWithNested(Referrable):
-    nested: list[str]
+    nested: list[str | dict]  # dict represents serialized LoopVariable
 
 
 class ReferrableWithFilters(Referrable):
     filters: dict
 
 
+def _serialize_nested_key(key: str | dict) -> str:
+    """
+    Serialize a single nested key for identifier computation.
+
+    Handles both string keys and LoopVariable dicts.
+    """
+    if isinstance(key, dict) and key.get('__typename') == 'LoopVariable':
+        # Format: LoopVar:uid:nested.joined
+        loop_nested = ','.join(key.get('nested', []))
+        return f'LoopVar:{key["uid"]}:{loop_nested}'
+    return str(key)
+
+
 def _get_identifier(obj: Referrable) -> str:
     """
     Get a unique identifier from a 'referrable' object
@@ -74,7 +86,9 @@ def _get_identifier(obj: Referrable) -> str:
 
     # If it's a Variable with 'nested', the property should be included in the identifier
     if _is_referrable_nested(obj) and len(obj['nested']) > 0:
-        nested = ','.join(cast(list[str], obj['nested']))
+        # Handle mixed string/LoopVariable nested
+        nested_parts = [_serialize_nested_key(k) for k in obj['nested']]
+        nested = ','.join(nested_parts)
         identifier = f'{identifier}:{nested}'
 
     return identifier

dara/core/router/dependency_graph.py

@@ -4,6 +4,14 @@ from dara.core.definitions import ComponentInstance
 from dara.core.interactivity.derived_variable import DerivedVariable
 from dara.core.visual.dynamic_component import PyComponentInstance
 
+# Control flow components have conditional children that shouldn't be preloaded
+# since only one branch will actually render at runtime
+CONTROL_FLOW_SKIP_ATTRS: dict[str, set[str]] = {
+    'If': {'true_children', 'false_children'},
+    'Match': {'when', 'default'},
+    'For': {'renderer', 'placeholder'},
+}
+
 
 class DependencyGraph(BaseModel):
     """
@@ -33,6 +41,9 @@ class DependencyGraph(BaseModel):
 def _analyze_component_dependencies(component: ComponentInstance, graph: DependencyGraph) -> None:
     """
     Recursively analyze a component tree to build a dependency graph of DerivedVariables and PyComponentInstances.
+
+    Note: Control flow components (If, Match, For) are treated as boundaries - their conditional
+    child properties are not recursed into since only one branch will render at runtime.
     """
     try:
         from dara.components import Table
@@ -45,8 +56,15 @@ def _analyze_component_dependencies(component: ComponentInstance, graph: Depende
             graph.py_components[component.uid] = component
         return
 
+    # Get properties to skip for control flow components
+    component_name = type(component).__name__
+    skip_attrs = CONTROL_FLOW_SKIP_ATTRS.get(component_name, set())
+
     # otherwise check each field
     for attr in component.model_fields_set:
+        # Skip conditional child properties of control flow components
+        if attr in skip_attrs:
+            continue
         value = getattr(component, attr, None)
 
         # Handle encountered variables and py_components

{dara_core-1.25.0.dist-info → dara_core-1.25.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.25.0
+Version: 1.25.1
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -21,10 +21,10 @@ Requires-Dist: cachetools (>=5.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.25.0)
+Requires-Dist: create-dara-app (==1.25.1)
 Requires-Dist: croniter (>=6.0.0,<7.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.25.0) ; extra == "all"
+Requires-Dist: dara-components (==1.25.1) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (>=0.115.0,<0.121.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
@@ -55,7 +55,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.25.0/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.25.1/img/dara_light.svg?raw=true">
 
 ![Master tests](https://github.com/causalens/dara/actions/workflows/tests.yml/badge.svg?branch=master)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
@@ -100,7 +100,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.25.0/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.25.1/img/components_gallery.png?raw=true)
 
 Note: `pip` installation uses [PEP 660](https://peps.python.org/pep-0660/) `pyproject.toml`-based editable installs which require `pip >= 21.3` and `setuptools >= 64.0.0`. You can upgrade both with:
 
@@ -117,9 +117,9 @@ Explore some of our favorite apps - a great way of getting started and getting t
 
 | Dara App                                                                                                 | Description                                                                                                                                                                                                       |
 | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| ![Large Language Model](https://github.com/causalens/dara/blob/v1.25.0/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
-| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.25.0/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
-| ![Graph Editor](https://github.com/causalens/dara/blob/v1.25.0/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
+| ![Large Language Model](https://github.com/causalens/dara/blob/v1.25.1/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
+| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.25.1/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
+| ![Graph Editor](https://github.com/causalens/dara/blob/v1.25.1/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -146,9 +146,9 @@ And the supporting UI packages and tools.
 - `ui-utils` - miscellaneous utility functions
 - `ui-widgets` - widget components
 
-More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.25.0/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.25.1/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.25.0/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.25.1/LICENSE).
 

{dara_core-1.25.0.dist-info → dara_core-1.25.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dara/core/__init__.py,sha256=yTp-lXT0yy9XqLGYWlmjPgFG5g2eEg2KhKo8KheTHoo,1408
 dara/core/_assets/__init__.py,sha256=13vMoWHvl1zcFcjNHh8lbTwWOvu4f7krYSco978qxwM,723
 dara/core/_assets/auto_js/dara.core.css,sha256=yT3PKpi2sKI2-kQIF8xtVbTPQqgpK7-Ua7tfzDPuSsI,4095881
-dara/core/_assets/auto_js/dara.core.umd.cjs,sha256=oEcImrkdIvWJ_zE4my8n9EGECjIQ5JZTVm8q_ChmbVM,5186433
+dara/core/_assets/auto_js/dara.core.umd.cjs,sha256=lVOHHDvZZflaUaIa3Cgx41JXU-2NyFCb8kD49Z8qIZ4,5191480
 dara/core/_assets/auto_js/react-dom.development.js,sha256=vR2Fq5LXMKS5JsTo2CMl6oGCJT8scJV2wXSteTtx8aE,1077040
 dara/core/_assets/auto_js/react-is.development.js,sha256=2IRgmaphdMq6wx2MbsmVUQ0UwapGETNjgano3XEkGcc,7932
 dara/core/_assets/auto_js/react-query.development.js,sha256=lI2fTKMvWmjbagGQaVtZYr51_-C_U_so064JwetuDS0,130366
@@ -37,16 +37,16 @@ dara/core/interactivity/client_variable.py,sha256=Ku59TBDXrqEsMkc-upQ_GspWqHGBdt
 dara/core/interactivity/condition.py,sha256=BHfRA5kkULBjLbS9Q2NpkWUxcCicm0aKTTrsEWQQCVE,1567
 dara/core/interactivity/data_variable.py,sha256=FJ6vtsZ-39C2KrOIaxSnjOBCD0mOHjvunMUkUjXon6Q,2500
 dara/core/interactivity/derived_data_variable.py,sha256=nfHYrd2a4dT7penr2JhPVnHAv3MGpKn1pIIF5mh4xQo,3611
-dara/core/interactivity/derived_variable.py,sha256=RMZbc1capmj_ceSG45GiQpheNgE1y9TIf8xl08YYHdY,32276
+dara/core/interactivity/derived_variable.py,sha256=pTB1w9j9Xlxxv2WoWS4O5ccMkrnsgvcMdjFubwqhxIs,32837
 dara/core/interactivity/filtering.py,sha256=_F0OtECufYCptRI6h98_vDliG9xcPD5SItlQkjiNqR4,9667
 dara/core/interactivity/loop_variable.py,sha256=9AvHUuyuneSLJstscv-o8gMd_FMd8p-U8QK5GqsPCVo,3611
 dara/core/interactivity/non_data_variable.py,sha256=k2yXTowWmH5UhG9iJfYo_bUG7AT5fdKSwX5LcDQ71-4,178
-dara/core/interactivity/plain_variable.py,sha256=tg4D8UMno5cwGtM4U6FJKPbjhRRk6rZ6hJeiGgbGdrw,13123
+dara/core/interactivity/plain_variable.py,sha256=naN_7ejDKnbCGxDmyFZ7xkO-B4yFTPKgtj-9so64QXg,13707
 dara/core/interactivity/server_variable.py,sha256=s1OoLIyWIVF0TAId5Pv3b6ZZpBEHjzTotYQufAYHjZI,11109
 dara/core/interactivity/state_variable.py,sha256=Xpiazq25XS12dgvr3m1ojoqSy7svdmMaRMBxABusOzQ,2441
 dara/core/interactivity/stream_event.py,sha256=83zAwf_MqjoWONNvutGW4uoIlTXXBJvLUGg7JuPNIWs,10059
 dara/core/interactivity/stream_utils.py,sha256=xcqr4mQj4IH0bI_hfZ2jb2FImYftJea1qGmC_-Wh1oY,2404
-dara/core/interactivity/stream_variable.py,sha256=M13XrqRC9Gj4ZNAHXsTnR-Lw4SKYzvbTK8qOvCAzMoc,12750
+dara/core/interactivity/stream_variable.py,sha256=pYKakNcwPazIgrTrMZHcMrcDVNFF0mfk6308irKEjpY,13614
 dara/core/interactivity/switch_variable.py,sha256=dhmAnF2KmL4944TJVipV-30BPYSLoD-uxyBP49W3V9Q,14099
 dara/core/interactivity/tabular_variable.py,sha256=rUz9jnU6ya_0J7dhIN8d0VCDfzO7N5AsvksrHNtCO7k,3337
 dara/core/interactivity/url_variable.py,sha256=lAtHgYvLA8RE-eFfv4Ix27T5YLGT5e0c0q9O5eQPOos,2282
@@ -59,7 +59,7 @@ dara/core/internal/cache_store/lru.py,sha256=6Jd4TmUX1LaEPnOraf8cSnL9Rx-A_LDhjqO
 dara/core/internal/cache_store/ttl.py,sha256=WzSZfdhK-nTf0fwCwtaRbJ-9I-FeTNBXgnZgSvZMbKQ,4966
 dara/core/internal/cgroup.py,sha256=yKCTY8RxyxnNy-Mw4tfzeZew1dL8qw381gHBVE96-OA,3217
 dara/core/internal/custom_response.py,sha256=MM0xEX7kVZWyX943Obl7sic3bxXr6kHGLWe6pc5pcYg,1304
-dara/core/internal/dependency_resolution.py,sha256=1ydLyUYzAQBKl13ECMT8_YaxUc8X8Tlvv9ZYdUvPgdE,11376
+dara/core/internal/dependency_resolution.py,sha256=Y3o9wnvEmFSfTaqc5Dqw2msDzwl5VtCNC2TmCkeLGHQ,11910
 dara/core/internal/devtools.py,sha256=4LsK7sqES33fAqb53dyH3n0OSWang3W-MiPsmo57aXU,2586
 dara/core/internal/download.py,sha256=wBSUapMY6evZ_sA5ZgvnWhaRtzVMIDIC51mPzFCMWuM,3548
 dara/core/internal/encoder_registry.py,sha256=Q8F5Y2uZVkx7EUtk4MZ99wvPBWaMnPKcFZzK92FYNPw,11159
@@ -67,7 +67,7 @@ dara/core/internal/execute_action.py,sha256=di2WBTHw6smcRRYv1uqJbnnMxPTRq2uxYLdq
 dara/core/internal/hashing.py,sha256=LTX249EpWfJ8ikx66o8t4gtSYxvcC00RKLOW6epbqCA,1094
 dara/core/internal/import_discovery.py,sha256=8DFtLulbOIoPr4yxnS1OO431dZA27hLEjylklW_cm6s,8042
 dara/core/internal/multi_resource_lock.py,sha256=mUoc6KKk8mpLGCXfa6nFd60yNuas4b6wsAk8VrvGDxI,2496
-dara/core/internal/normalization.py,sha256=dgZZemPq8NP04uvcEwElqDd8JV6FYx_UuFfgyrOZSNk,6008
+dara/core/internal/normalization.py,sha256=aCRCT5G9RZJzPGlVvMgNoqOZVXSs_Ku5QiqVp81hsfY,6583
 dara/core/internal/pandas_utils.py,sha256=1au2ixLfqdvwuFApwah580Y0WD6puw_Q0lBgFtK-Hdo,6514
 dara/core/internal/pool/__init__.py,sha256=pBbXE5GR3abVC9Lg3i0QxfdmsrBDMJUYAYb0SiAEBkk,657
 dara/core/internal/pool/channel.py,sha256=mLYa-R4KBGjRENDc9r1Hym5TpIeLv9y5kLJtjI7YXZA,4911
@@ -109,7 +109,7 @@ dara/core/persistence.py,sha256=EAEER1T0MHBrtT-iLZ-eXzAsqwu4Klqw5mDlTPSdPkI,1932
 dara/core/router/__init__.py,sha256=yGI_MgLQU37ircCtYVNjnhqCjWQxKd5amoNqvMyrhOs,121
 dara/core/router/compat.py,sha256=B83wq46AwQARTDfZwGrpr0slrnQmi_T7shOUNpqltSM,3112
 dara/core/router/components.py,sha256=Wsf_bBnnN-1EE5jhbjPSOyDv_TVKEsY4royyOQOazM4,6132
-dara/core/router/dependency_graph.py,sha256=4N8RVTLi1JD-zOMzgEFJgGemQw08i0ItBSWnRK73HP4,2577
+dara/core/router/dependency_graph.py,sha256=iX2f7l_FaEuaTHsEyl2wOl_eboic9EXEOsMXpmduQP4,3368
 dara/core/router/router.py,sha256=ys3k48pIjTdbmch5516O4TAeo8IIUPThdqgeoXC-kMQ,32593
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=Jrh38Q4Lc8iFFVKPuEaDeloYHVLohTTHgK92u1e_ZtY,2515
@@ -137,8 +137,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=QazCRDqh_SCOyQhdwMkH1wbHf301oL7gCFj91plbLww,2020
 dara/core/visual/themes/definitions.py,sha256=dtET2YUlwXkO6gJ23MqSb8gIq-LxJ343CWsgueWSifM,2787
 dara/core/visual/themes/light.py,sha256=dtHb6Q1HOb5r_AvJfe0vZajikVc-GnBEUrGsTcI5MHA,2022
-dara_core-1.25.0.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.25.0.dist-info/METADATA,sha256=IJIVP_H8n7KDDql7fQQoK49XrIPU8JwiCK60A-ubO7E,7523
-dara_core-1.25.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.25.0.dist-info/entry_points.txt,sha256=nAT9o1kJCmTK1saDh29PFGFD6cbxDDDjTj31HDEDwfU,197
-dara_core-1.25.0.dist-info/RECORD,,
+dara_core-1.25.1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.25.1.dist-info/METADATA,sha256=SF56wMSWO_gCpH-bl9TMw_-fRLautCupnHJlT22Azeg,7523
+dara_core-1.25.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.25.1.dist-info/entry_points.txt,sha256=nAT9o1kJCmTK1saDh29PFGFD6cbxDDDjTj31HDEDwfU,197
+dara_core-1.25.1.dist-info/RECORD,,