@plasmicpkgs/plasmic-cms 0.0.46 → 0.0.47

package/dist/components.d.ts

@@ -2,7 +2,7 @@ import { CanvasComponentProps, ComponentMeta } from "@plasmicapp/host/registerCo
 import { GlobalContextMeta } from "@plasmicapp/host/registerGlobalContext";
 import React from "react";
 import { DatabaseConfig, QueryParams } from "./api";
-import { ApiCmsRow, ApiCmsTable } from "./schema";
+import { ApiCmsRow, ApiCmsTable, CmsFieldMeta } from "./schema";
 interface FetcherComponentProps {
     hideIfNotFound?: boolean;
 }
@@ -14,6 +14,13 @@ export declare function CmsCredentialsProvider({ children, ...config }: CmsCrede
 declare type TablesContextData = {
     tables?: ApiCmsTable[];
 };
+interface TableContextData extends TablesContextData {
+    table?: string;
+}
+interface RowContextData extends TableContextData {
+    row: ApiCmsRow;
+    fieldMeta?: CmsFieldMeta;
+}
 interface CmsQueryLoaderProps extends QueryParams, CanvasComponentProps<TablesContextData> {
     children?: React.ReactNode;
     table?: string;
@@ -26,16 +33,17 @@ interface CmsRowRepeaterProps extends CanvasComponentProps<TablesContextData> {
 }
 export declare const cmsRowRepeaterMeta: ComponentMeta<CmsRowRepeaterProps>;
 export declare function CmsRowRepeater({ table, children, setControlContextData, }: CmsRowRepeaterProps): JSX.Element;
-interface CmsQueryRepeaterProps extends QueryParams, CanvasComponentProps<TablesContextData> {
+interface CmsQueryRepeaterProps extends QueryParams, CanvasComponentProps<TableContextData> {
     children?: React.ReactNode;
     table?: string;
+    emptyMessage?: React.ReactNode;
+    forceEmptyState?: boolean;
+    loadingMessage?: React.ReactNode;
+    forceLoadingState?: boolean;
 }
 export declare const cmsQueryRepeaterMeta: ComponentMeta<CmsQueryRepeaterProps>;
-export declare function CmsQueryRepeater({ table, children, setControlContextData, where, useDraft, orderBy, desc, limit, }: CmsQueryLoaderProps): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
-interface CmsRowFieldProps extends CanvasComponentProps<TablesContextData & {
-    table: string;
-    row: ApiCmsRow;
-}> {
+export declare function CmsQueryRepeater({ table, children, setControlContextData, where, useDraft, orderBy, desc, limit, emptyMessage, forceEmptyState, loadingMessage, forceLoadingState, }: CmsQueryRepeaterProps): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
+interface CmsRowFieldProps extends CanvasComponentProps<RowContextData> {
     table?: string;
     field?: string;
     className?: string;
@@ -43,10 +51,7 @@ interface CmsRowFieldProps extends CanvasComponentProps<TablesContextData & {
 }
 export declare const cmsRowFieldMeta: ComponentMeta<CmsRowFieldProps>;
 export declare function CmsRowField({ className, table, field, dateFormat, setControlContextData, ...rest }: CmsRowFieldProps): JSX.Element | null;
-interface TableContextData extends TablesContextData {
-    table?: string;
-}
-interface CmsRowLinkProps extends CanvasComponentProps<TableContextData> {
+interface CmsRowLinkProps extends CanvasComponentProps<RowContextData> {
     table: string;
     field: string;
     hrefProp: string;
@@ -56,7 +61,7 @@ interface CmsRowLinkProps extends CanvasComponentProps<TableContextData> {
 }
 export declare const cmsRowLinkMeta: ComponentMeta<CmsRowLinkProps>;
 export declare function CmsRowLink({ table, field, hrefProp, children, setControlContextData, prefix, suffix, }: CmsRowLinkProps): React.ReactElement | null;
-interface CmsRowImageProps extends CanvasComponentProps<TableContextData> {
+interface CmsRowImageProps extends CanvasComponentProps<RowContextData> {
     table: string;
     field: string;
     srcProp: string;
@@ -64,7 +69,7 @@ interface CmsRowImageProps extends CanvasComponentProps<TableContextData> {
 }
 export declare const cmsRowImageMeta: ComponentMeta<CmsRowImageProps>;
 export declare function CmsRowImage({ table, field, srcProp, children, setControlContextData, }: CmsRowImageProps): React.ReactElement | null;
-interface CmsRowFieldValueProps extends CanvasComponentProps<TableContextData> {
+interface CmsRowFieldValueProps extends CanvasComponentProps<RowContextData> {
     table: string;
     field: string;
     valueProp: string;

package/dist/context.d.ts

@@ -20,7 +20,8 @@ export declare function QueryResultProvider({ children, table, rows, }: {
     table: string;
     rows: ApiCmsRow[];
 }): JSX.Element;
-export declare function useRow(table?: string): {
+export declare function useTablesWithDataLoaded(): ApiCmsTable[] | undefined;
+export declare function useRow(tables?: ApiCmsTable[], table?: string): {
     table: string;
     row: ApiCmsRow | undefined;
 } | undefined;

package/dist/plasmic-cms.cjs.development.js

@@ -1287,7 +1287,7 @@ function QueryResultProvider(_ref3) {
     data: rows
   }, children);
 }
-function useRow(table) {
+function useTablesWithDataLoaded() {
   var env = host.useDataEnv();
   var tables = useTables();
 
@@ -1295,39 +1295,33 @@ function useRow(table) {
     return undefined;
   }
 
-  if (table) {
-    return {
-      table: table,
-      row: env[mkRowContextKey(table)]
-    };
-  }
-
   if (!tables) {
     return undefined;
   }
 
   var matchingKeys = getClosestMatchingKeys(env, rowContextPrefix);
-
-  var _loop2 = function _loop2() {
-    var key = _step2.value;
-    var inferredTable = tables.find(function (t) {
-      return mkRowContextKey(t.identifier) === key;
+  return tables.filter(function (table) {
+    return matchingKeys.some(function (key) {
+      return mkRowContextKey(table.identifier) === key;
     });
+  });
+}
+function useRow(tables, table) {
+  var env = host.useDataEnv();
 
-    if (inferredTable) {
-      return {
-        v: {
-          table: inferredTable.identifier,
-          row: env[key]
-        }
-      };
-    }
-  };
+  if (!env) {
+    return undefined;
+  }
 
-  for (var _iterator2 = _createForOfIteratorHelperLoose(matchingKeys), _step2; !(_step2 = _iterator2()).done;) {
-    var _ret2 = _loop2();
+  if (!table && tables && tables.length > 0) {
+    table = tables[0].identifier;
+  }
 
-    if (typeof _ret2 === "object") return _ret2.v;
+  if (table) {
+    return {
+      table: table,
+      row: env[mkRowContextKey(table)]
+    };
   }
 
   return undefined;
@@ -1396,7 +1390,7 @@ var fetcherComponentPropMetas = {
   }
 };
 
-function renderMaybeData(maybeData, renderFn, loaderProps) {
+function renderMaybeData(maybeData, renderFn, loaderProps, loadingMessage, forceLoadingState) {
   if ("error" in maybeData) {
     var error = maybeData.error;
 
@@ -1411,8 +1405,8 @@ function renderMaybeData(maybeData, renderFn, loaderProps) {
     }
   }
 
-  if (!("data" in maybeData)) {
-    return React.createElement("div", null, "Loading...");
+  if (!("data" in maybeData) || forceLoadingState) {
+    return React.createElement(React.Fragment, null, loadingMessage != null ? loadingMessage : React.createElement("div", null, "Loading..."));
   }
 
   return renderFn(maybeData.data);
@@ -1699,6 +1693,7 @@ var cmsQueryRepeaterMeta = {
   props: {
     children: {
       type: "slot",
+      isRepeated: true,
       defaultValue: {
         type: "vbox",
         children: [{
@@ -1713,6 +1708,9 @@ var cmsQueryRepeaterMeta = {
       description: "CMS model (table) to query.",
       options: function options(_, ctx) {
         return mkTableOptions(ctx == null ? void 0 : ctx.tables);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        return ctx == null ? void 0 : ctx.table;
       }
     },
     useDraft: {
@@ -1733,9 +1731,8 @@ var cmsQueryRepeaterMeta = {
       type: "choice",
       displayName: "Order by",
       description: "Field to order by.",
-      options: function options(_ref8, ctx) {
-        var table = _ref8.table;
-        return mkFieldOptions(ctx == null ? void 0 : ctx.tables, table);
+      options: function options(_, ctx) {
+        return mkFieldOptions(ctx == null ? void 0 : ctx.tables, ctx == null ? void 0 : ctx.table);
       }
     },
     desc: {
@@ -1749,28 +1746,50 @@ var cmsQueryRepeaterMeta = {
       displayName: "Limit",
       description: "Maximum number of entries to fetch (0 for unlimited).",
       defaultValue: 0
+    },
+    emptyMessage: {
+      type: "slot",
+      defaultValue: {
+        type: "text",
+        value: "No matching entries found."
+      }
+    },
+    forceEmptyState: {
+      type: "boolean",
+      displayName: "Force empty state",
+      description: "If set, will render as if no matching entries were found.",
+      defaultValue: false
+    },
+    loadingMessage: {
+      type: "slot",
+      defaultValue: {
+        type: "text",
+        value: "Loading..."
+      }
+    },
+    forceLoadingState: {
+      type: "boolean",
+      displayName: "Force loading state",
+      description: "If set, will render as if it is waiting for the query to run.",
+      defaultValue: false
     }
   }
 };
-function CmsQueryRepeater(_ref9) {
-  var table = _ref9.table,
-      children = _ref9.children,
-      setControlContextData = _ref9.setControlContextData,
-      where = _ref9.where,
-      useDraft = _ref9.useDraft,
-      orderBy = _ref9.orderBy,
-      desc = _ref9.desc,
-      limit = _ref9.limit;
+function CmsQueryRepeater(_ref8) {
+  var table = _ref8.table,
+      children = _ref8.children,
+      setControlContextData = _ref8.setControlContextData,
+      where = _ref8.where,
+      useDraft = _ref8.useDraft,
+      orderBy = _ref8.orderBy,
+      desc = _ref8.desc,
+      limit = _ref8.limit,
+      emptyMessage = _ref8.emptyMessage,
+      forceEmptyState = _ref8.forceEmptyState,
+      loadingMessage = _ref8.loadingMessage,
+      forceLoadingState = _ref8.forceLoadingState;
   var databaseConfig = useDatabase();
   var tables = useTables();
-
-  if (tables) {
-    // TODO: Only include table if __plasmic_cms_row_{table} exists.
-    setControlContextData == null ? void 0 : setControlContextData({
-      tables: tables
-    });
-  }
-
   var params = {
     where: where,
     useDraft: useDraft,
@@ -1789,6 +1808,14 @@ function CmsQueryRepeater(_ref9) {
     table = tables[0].identifier;
   }
 
+  if (tables) {
+    // TODO: Only include table if __plasmic_cms_row_{table} exists.
+    setControlContextData == null ? void 0 : setControlContextData({
+      tables: tables,
+      table: table
+    });
+  }
+
   var maybeData = query.usePlasmicQueryData(cacheKey, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3() {
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
@@ -1830,8 +1857,8 @@ function CmsQueryRepeater(_ref9) {
     }, _callee3);
   })));
   return renderMaybeData(maybeData, function (rows) {
-    if (rows.length === 0) {
-      return React.createElement("div", null, "No matching entries found.");
+    if (rows.length === 0 || forceEmptyState) {
+      return React.createElement(React.Fragment, null, " ", emptyMessage, " ");
     }
 
     return React.createElement(QueryResultProvider, {
@@ -1845,7 +1872,7 @@ function CmsQueryRepeater(_ref9) {
     }));
   }, {
     hideIfNotFound: false
-  });
+  }, loadingMessage, forceLoadingState);
 }
 var cmsRowFieldMeta = {
   name: componentPrefix + "-row-field",
@@ -1859,24 +1886,32 @@ var cmsRowFieldMeta = {
       description: "CMS model (table) to use.",
       options: function options(_, ctx) {
         return mkTableOptions(ctx == null ? void 0 : ctx.tables);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        return ctx == null ? void 0 : ctx.table;
       }
     },
     field: {
       type: "choice",
       displayName: "Field",
       description: "Field (from model schema) to use.",
-      options: function options(_ref11, ctx) {
+      options: function options(_ref10, ctx) {
         var _ctx$table;
 
-        var table = _ref11.table;
+        var table = _ref10.table;
         return mkFieldOptions(ctx == null ? void 0 : ctx.tables, (_ctx$table = ctx == null ? void 0 : ctx.table) != null ? _ctx$table : table, ["number", "boolean", "text", "long-text", "date-time", "rich-text", "image"]);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        var _ctx$fieldMeta, _ctx$fieldMeta2;
+
+        return (ctx == null ? void 0 : (_ctx$fieldMeta = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta.name) || (ctx == null ? void 0 : (_ctx$fieldMeta2 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta2.identifier);
       }
     },
     dateFormat: {
       type: "choice",
       displayName: "Date Format",
-      hidden: function hidden(_ref12, ctx) {
-        var field = _ref12.field;
+      hidden: function hidden(_ref11, ctx) {
+        var field = _ref11.field;
 
         if (!ctx) {
           return true;
@@ -1945,18 +1980,18 @@ var cmsRowFieldMeta = {
     }
   }
 };
-function CmsRowField(_ref13) {
+function CmsRowField(_ref12) {
   var _res$row$data;
 
-  var className = _ref13.className,
-      table = _ref13.table,
-      field = _ref13.field,
-      dateFormat = _ref13.dateFormat,
-      setControlContextData = _ref13.setControlContextData,
-      rest = _objectWithoutPropertiesLoose(_ref13, _excluded2);
+  var className = _ref12.className,
+      table = _ref12.table,
+      field = _ref12.field,
+      dateFormat = _ref12.dateFormat,
+      setControlContextData = _ref12.setControlContextData,
+      rest = _objectWithoutPropertiesLoose(_ref12, _excluded2);
 
-  var tables = useTables();
-  var res = useRow(table);
+  var tables = useTablesWithDataLoaded();
+  var res = useRow(tables, table);
 
   if (!res) {
     return React.createElement("div", {
@@ -1970,22 +2005,23 @@ function CmsRowField(_ref13) {
     }, "Error: No CMS Entry found");
   }
 
+  var fieldMeta = deriveInferredTableField({
+    table: res.table,
+    tables: tables,
+    field: field,
+    typeFilters: ["text", "long-text", "rich-text"]
+  });
+
   if (tables) {
     // TODO: Only include table if __plasmic_cms_row_{table} exists.
     setControlContextData == null ? void 0 : setControlContextData({
       tables: tables,
       table: res.table,
-      row: res.row
+      row: res.row,
+      fieldMeta: fieldMeta
     });
   }
 
-  var fieldMeta = deriveInferredTableField({
-    table: res.table,
-    tables: tables,
-    field: field,
-    typeFilters: ["text", "long-text", "rich-text"]
-  });
-
   if (!fieldMeta) {
     throw new Error("Please select an entry field to display.");
   }
@@ -2013,6 +2049,7 @@ function deriveInferredTableField(opts) {
       tables = opts.tables,
       field = opts.field,
       typeFilters = opts.typeFilters;
+  if (!table) return undefined;
   var schema = tables == null ? void 0 : (_tables$find = tables.find(function (t) {
     return t.identifier === table;
   })) == null ? void 0 : _tables$find.schema;
@@ -2080,17 +2117,25 @@ var cmsRowLinkMeta = {
       description: "CMS model (table) to use.",
       options: function options(_, ctx) {
         return mkTableOptions(ctx == null ? void 0 : ctx.tables);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        return ctx == null ? void 0 : ctx.table;
       }
     },
     field: {
       type: "choice",
       displayName: "Field",
       description: "Field (from model schema) to use.",
-      options: function options(_ref14, ctx) {
+      options: function options(_ref13, ctx) {
         var _ctx$table2;
 
-        var table = _ref14.table;
+        var table = _ref13.table;
         return mkFieldOptions(ctx == null ? void 0 : ctx.tables, (_ctx$table2 = ctx == null ? void 0 : ctx.table) != null ? _ctx$table2 : table);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        var _ctx$fieldMeta3, _ctx$fieldMeta4;
+
+        return (ctx == null ? void 0 : (_ctx$fieldMeta3 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta3.name) || (ctx == null ? void 0 : (_ctx$fieldMeta4 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta4.identifier);
       }
     },
     hrefProp: {
@@ -2111,31 +2156,23 @@ var cmsRowLinkMeta = {
     }
   }
 };
-function CmsRowLink(_ref15) {
+function CmsRowLink(_ref14) {
   var _res$row$data2;
 
-  var table = _ref15.table,
-      field = _ref15.field,
-      hrefProp = _ref15.hrefProp,
-      children = _ref15.children,
-      setControlContextData = _ref15.setControlContextData,
-      prefix = _ref15.prefix,
-      suffix = _ref15.suffix;
-  var tables = useTables();
-  var res = useRow(table);
+  var table = _ref14.table,
+      field = _ref14.field,
+      hrefProp = _ref14.hrefProp,
+      children = _ref14.children,
+      setControlContextData = _ref14.setControlContextData,
+      prefix = _ref14.prefix,
+      suffix = _ref14.suffix;
+  var tables = useTablesWithDataLoaded();
+  var res = useRow(tables, table);
 
   if (!res || !res.row) {
     return React.createElement(React.Fragment, null, children);
   }
 
-  if (tables) {
-    // TODO: Only include table if __plasmic_cms_row_{table} exists.
-    setControlContextData == null ? void 0 : setControlContextData({
-      tables: tables,
-      table: res.table
-    });
-  }
-
   var fieldMeta = deriveInferredTableField({
     table: res.table,
     tables: tables,
@@ -2143,6 +2180,16 @@ function CmsRowLink(_ref15) {
     typeFilters: ["text"]
   });
 
+  if (tables) {
+    // TODO: Only include table if __plasmic_cms_row_{table} exists.
+    setControlContextData == null ? void 0 : setControlContextData({
+      tables: tables,
+      table: res.table,
+      row: res.row,
+      fieldMeta: fieldMeta
+    });
+  }
+
   if (!fieldMeta) {
     return React.createElement(React.Fragment, null, children);
   }
@@ -2182,17 +2229,25 @@ var cmsRowImageMeta = {
       description: "CMS model (table) to use.",
       options: function options(_, ctx) {
         return mkTableOptions(ctx == null ? void 0 : ctx.tables);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        return ctx == null ? void 0 : ctx.table;
       }
     },
     field: {
       type: "choice",
       displayName: "Field",
       description: "Field (from model schema) to use.",
-      options: function options(_ref16, ctx) {
+      options: function options(_ref15, ctx) {
         var _ctx$table3;
 
-        var table = _ref16.table;
-        return mkFieldOptions(ctx == null ? void 0 : ctx.tables, (_ctx$table3 = ctx == null ? void 0 : ctx.table) != null ? _ctx$table3 : table);
+        var table = _ref15.table;
+        return mkFieldOptions(ctx == null ? void 0 : ctx.tables, (_ctx$table3 = ctx == null ? void 0 : ctx.table) != null ? _ctx$table3 : table, ["image"]);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        var _ctx$fieldMeta5, _ctx$fieldMeta6;
+
+        return (ctx == null ? void 0 : (_ctx$fieldMeta5 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta5.name) || (ctx == null ? void 0 : (_ctx$fieldMeta6 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta6.identifier);
       }
     },
     srcProp: {
@@ -2203,29 +2258,21 @@ var cmsRowImageMeta = {
     }
   }
 };
-function CmsRowImage(_ref17) {
+function CmsRowImage(_ref16) {
   var _res$row$data3;
 
-  var table = _ref17.table,
-      field = _ref17.field,
-      srcProp = _ref17.srcProp,
-      children = _ref17.children,
-      setControlContextData = _ref17.setControlContextData;
-  var tables = useTables();
-  var res = useRow(table);
+  var table = _ref16.table,
+      field = _ref16.field,
+      srcProp = _ref16.srcProp,
+      children = _ref16.children,
+      setControlContextData = _ref16.setControlContextData;
+  var tables = useTablesWithDataLoaded();
+  var res = useRow(tables, table);
 
   if (!res || !res.row) {
     return React.createElement(React.Fragment, null, children);
   }
 
-  if (tables) {
-    // TODO: Only include table if __plasmic_cms_row_{table} exists.
-    setControlContextData == null ? void 0 : setControlContextData({
-      tables: tables,
-      table: res.table
-    });
-  }
-
   var fieldMeta = deriveInferredTableField({
     table: res.table,
     tables: tables,
@@ -2233,6 +2280,16 @@ function CmsRowImage(_ref17) {
     typeFilters: ["image"]
   });
 
+  if (tables) {
+    // TODO: Only include table if __plasmic_cms_row_{table} exists.
+    setControlContextData == null ? void 0 : setControlContextData({
+      tables: tables,
+      table: res.table,
+      row: res.row,
+      fieldMeta: fieldMeta
+    });
+  }
+
   if (!fieldMeta) {
     return React.createElement(React.Fragment, null, children);
   }
@@ -2274,17 +2331,25 @@ var cmsRowFieldValueMeta = {
       description: "CMS model (table) to use.",
       options: function options(_, ctx) {
         return mkTableOptions(ctx == null ? void 0 : ctx.tables);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        return ctx == null ? void 0 : ctx.table;
       }
     },
     field: {
       type: "choice",
       displayName: "Field",
       description: "Field (from model schema) to use.",
-      options: function options(_ref18, ctx) {
+      options: function options(_ref17, ctx) {
         var _ctx$table4;
 
-        var table = _ref18.table;
+        var table = _ref17.table;
         return mkFieldOptions(ctx == null ? void 0 : ctx.tables, (_ctx$table4 = ctx == null ? void 0 : ctx.table) != null ? _ctx$table4 : table);
+      },
+      defaultValueHint: function defaultValueHint(_, ctx) {
+        var _ctx$fieldMeta7, _ctx$fieldMeta8;
+
+        return (ctx == null ? void 0 : (_ctx$fieldMeta7 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta7.name) || (ctx == null ? void 0 : (_ctx$fieldMeta8 = ctx.fieldMeta) == null ? void 0 : _ctx$fieldMeta8.identifier);
       }
     },
     valueProp: {
@@ -2295,31 +2360,23 @@ var cmsRowFieldValueMeta = {
     }
   }
 };
-function CmsRowFieldValue(_ref19) {
+function CmsRowFieldValue(_ref18) {
   var _res$row$data4;
 
-  var table = _ref19.table,
-      field = _ref19.field,
-      valueProp = _ref19.valueProp,
-      children = _ref19.children,
-      setControlContextData = _ref19.setControlContextData,
-      rest = _objectWithoutPropertiesLoose(_ref19, _excluded3);
+  var table = _ref18.table,
+      field = _ref18.field,
+      valueProp = _ref18.valueProp,
+      children = _ref18.children,
+      setControlContextData = _ref18.setControlContextData,
+      rest = _objectWithoutPropertiesLoose(_ref18, _excluded3);
 
-  var tables = useTables();
-  var res = useRow(table);
+  var tables = useTablesWithDataLoaded();
+  var res = useRow(tables, table);
 
   if (!res || !res.row) {
     return React.createElement(React.Fragment, null, children);
   }
 
-  if (tables) {
-    // TODO: Only include table if __plasmic_cms_row_{table} exists.
-    setControlContextData == null ? void 0 : setControlContextData({
-      tables: tables,
-      table: res.table
-    });
-  }
-
   var fieldMeta = deriveInferredTableField({
     table: res.table,
     tables: tables,
@@ -2327,6 +2384,16 @@ function CmsRowFieldValue(_ref19) {
     typeFilters: ["text"]
   });
 
+  if (tables) {
+    // TODO: Only include table if __plasmic_cms_row_{table} exists.
+    setControlContextData == null ? void 0 : setControlContextData({
+      tables: tables,
+      table: res.table,
+      row: res.row,
+      fieldMeta: fieldMeta
+    });
+  }
+
   if (!fieldMeta) {
     return React.createElement(React.Fragment, null, children);
   }
@@ -2377,13 +2444,13 @@ var cmsRowLoaderMeta = {
     }
   }, fetcherComponentPropMetas)
 };
-function CmsRowLoader(_ref20) {
-  var table = _ref20.table,
-      row = _ref20.row,
-      children = _ref20.children,
-      useDraft = _ref20.useDraft,
-      hideIfNotFound = _ref20.hideIfNotFound,
-      setControlContextData = _ref20.setControlContextData;
+function CmsRowLoader(_ref19) {
+  var table = _ref19.table,
+      row = _ref19.row,
+      children = _ref19.children,
+      useDraft = _ref19.useDraft,
+      hideIfNotFound = _ref19.hideIfNotFound,
+      setControlContextData = _ref19.setControlContextData;
   var databaseConfig = useDatabase();
   var tables = useTables();