@wix/patterns 1.427.0 → 1.430.0

package/src/components/Table/AddFieldColumnHeader.st.css.ts

@@ -5,7 +5,7 @@ import { classesRuntime, statesRuntime } from "../../stylable-esm-runtime.js";
 
 
 
-var _namespace_ = "AddFieldColumnHeader2791313261";
+var _namespace_ = "AddFieldColumnHeader4116971040";
 var _style_ = classesRuntime.bind(null, _namespace_);
 
 export var cssStates = statesRuntime.bind(null, _namespace_);
@@ -13,7 +13,7 @@ export var style = _style_;
 export var st: import("@stylable/runtime").STFunction = _style_;
 
 export var namespace = _namespace_;
-export var classes = {"root":"AddFieldColumnHeader2791313261__root","title":"AddFieldColumnHeader2791313261__title","hoverBridge":"AddFieldColumnHeader2791313261__hoverBridge"};
+export var classes = {"root":"AddFieldColumnHeader4116971040__root","title":"AddFieldColumnHeader4116971040__title","hoverBridge":"AddFieldColumnHeader4116971040__hoverBridge"};
 export var keyframes = {}; 
 export var layers = {};
 export var containers = {};

package/src/components/TabsFilter/TabsFilter.st.css.ts

@@ -5,7 +5,7 @@ import { classesRuntime, statesRuntime } from "../../stylable-esm-runtime.js";
 
 
 
-var _namespace_ = "TabsFilter322255717";
+var _namespace_ = "TabsFilter1711245310";
 var _style_ = classesRuntime.bind(null, _namespace_);
 
 export var cssStates = statesRuntime.bind(null, _namespace_);
@@ -13,7 +13,7 @@ export var style = _style_;
 export var st: import("@stylable/runtime").STFunction = _style_;
 
 export var namespace = _namespace_;
-export var classes = {"root":"TabsFilter322255717__root","title":"TabsFilter322255717__title"};
+export var classes = {"root":"TabsFilter1711245310__root","title":"TabsFilter1711245310__title"};
 export var keyframes = {}; 
 export var layers = {};
 export var containers = {};

package/src/components/Tags/ManageTags/ManageTagsModal/ManageTagsModal.st.css.ts

@@ -5,7 +5,7 @@ import { classesRuntime, statesRuntime } from "../../../../stylable-esm-runtime.
 
 
 
-var _namespace_ = "ManageTagsModal2098405983";
+var _namespace_ = "ManageTagsModal1320417957";
 var _style_ = classesRuntime.bind(null, _namespace_);
 
 export var cssStates = statesRuntime.bind(null, _namespace_);
@@ -13,7 +13,7 @@ export var style = _style_;
 export var st: import("@stylable/runtime").STFunction = _style_;
 
 export var namespace = _namespace_;
-export var classes = {"root":"ManageTagsModal2098405983__root"};
+export var classes = {"root":"ManageTagsModal1320417957__root"};
 export var keyframes = {}; 
 export var layers = {};
 export var containers = {};

package/src/components/ToolbarItem/ToolbarItem.st.css.ts

@@ -5,7 +5,7 @@ import { classesRuntime, statesRuntime } from "../../stylable-esm-runtime.js";
 
 
 
-var _namespace_ = "ToolbarItem1784934616";
+var _namespace_ = "ToolbarItem714044881";
 var _style_ = classesRuntime.bind(null, _namespace_);
 
 export var cssStates = statesRuntime.bind(null, _namespace_);
@@ -13,7 +13,7 @@ export var style = _style_;
 export var st: import("@stylable/runtime").STFunction = _style_;
 
 export var namespace = _namespace_;
-export var classes = {"root":"ToolbarItem1784934616__root"};
+export var classes = {"root":"ToolbarItem714044881__root"};
 export var keyframes = {}; 
 export var layers = {};
 export var containers = {};

package/src/components/ToolbarItemBox/ToolbarItemBox.st.css.ts

@@ -5,7 +5,7 @@ import { classesRuntime, statesRuntime } from "../../stylable-esm-runtime.js";
 
 
 
-var _namespace_ = "ToolbarItemBox2709261406";
+var _namespace_ = "ToolbarItemBox2861690222";
 var _style_ = classesRuntime.bind(null, _namespace_);
 
 export var cssStates = statesRuntime.bind(null, _namespace_);
@@ -13,7 +13,7 @@ export var style = _style_;
 export var st: import("@stylable/runtime").STFunction = _style_;
 
 export var namespace = _namespace_;
-export var classes = {"root":"ToolbarItemBox2709261406__root"};
+export var classes = {"root":"ToolbarItemBox2861690222__root"};
 export var keyframes = {}; 
 export var layers = {};
 export var containers = {};

package/src/components/common.st.css.ts

@@ -5,7 +5,7 @@ import { classesRuntime, statesRuntime } from "../stylable-esm-runtime.js";
 
 
 
-var _namespace_ = "common1667624752";
+var _namespace_ = "common843717652";
 var _style_ = classesRuntime.bind(null, _namespace_);
 
 export var cssStates = statesRuntime.bind(null, _namespace_);
@@ -13,7 +13,7 @@ export var style = _style_;
 export var st: import("@stylable/runtime").STFunction = _style_;
 
 export var namespace = _namespace_;
-export var classes = {"root":"common1667624752__root","column":"common1667624752__column","fullHeight":"common1667624752__fullHeight"};
+export var classes = {"root":"common843717652__root","column":"common843717652__column","fullHeight":"common843717652__fullHeight"};
 export var keyframes = {}; 
 export var layers = {};
 export var containers = {};

package/src/exports/schema.ts

@@ -4,10 +4,15 @@ export {
   useGridCollection,
   useEditableTableCollection,
   useLayoutSwitchCollection,
-  schemaSourceMutations,
+  usePlatformizedSource,
+  sourceMutations,
 } from '../schema';
 export type {
+  PlatformizedSourceInput,
   SchemaCollectionOptions,
   SchemaEditableTableCollectionOptions,
   SchemaLayoutSwitchCollectionOptions,
 } from '../schema';
+export type { FieldsSourceProvider } from '../components/fieldsSourceProvider';
+export { useSchemaSource } from '@wix/bex-core/react';
+export type { SchemaSource, SchemaSourceInput } from '@wix/bex-core';

package/src/hooks/index.ts

@@ -3,8 +3,6 @@ export * from './useBuildOption';
 export * from './usePickerModal';
 export * from './usePickerStandalone';
 export * from './useViews';
-export * from './useSchemaImport';
-export * from './usePlatformizedImport';
 export * from './useEmptyStateTexts';
 export * from './customModalContent';
 export * from './useDropdownSelectFilterState';

package/src/hooks/useBmHarmonyTheme.ts

@@ -0,0 +1,9 @@
+import { useWixPatternsContainer } from '@wix/bex-core/react';
+
+export const BM_HARMONY_THEME_EXPERIMENT = 'bmHarmonyTheme';
+
+/** Whether the BM harmony visual refresh is enabled for this user. */
+export function useBmHarmonyTheme(): boolean {
+  const { experiments } = useWixPatternsContainer();
+  return experiments.enabled(BM_HARMONY_THEME_EXPERIMENT);
+}

package/src/hooks/useEntityPage.ts

@@ -13,6 +13,7 @@ export type UseEntityPageParams<T, V extends FieldValues = FieldValues> = Pick<
   | 'form'
   | 'parentPageId'
   | 'parentPath'
+  | 'schemaSource'
 >;
 
 export function useEntityPage<T, V extends FieldValues = FieldValues>(

package/src/index.ts

@@ -6,6 +6,7 @@ export * from './components/PaginationTable';
 export * from './components/CollectionListItem';
 export * from './components/PageWrapper/PageWrapper';
 export * from './components/EntityPage';
+export * from './components/EntityPageFields';
 export * from './components/SettingsPage/SettingsPage';
 export * from './components/MoreActions';
 export * from './components/CollectionPage';
@@ -131,8 +132,6 @@ export {
 export * from './hooks/usePickerStandalone';
 export * from './hooks/useSetupWidget';
 export * from './hooks/useViews';
-export * from './hooks/useSchemaImport';
-export * from './hooks/usePlatformizedImport';
 export * from './hooks/useTableGridSwitchFolders';
 export * from './hooks/useTableCollection';
 export * from './hooks/useGridCollection';
@@ -247,7 +246,6 @@ export {
   withDashboard,
 } from '@wix/bex-core/react';
 
-export { useCreateImport } from '@wix/bex-core';
 export type { BackupFn } from '@wix/bex-core';
 
 export {

package/src/schema/index.ts

@@ -3,5 +3,9 @@ export * from './useTableCollection';
 export * from './useGridCollection';
 export * from './useEditableTableCollection';
 export * from './useLayoutSwitchCollection';
+export {
+  usePlatformizedSource,
+  type PlatformizedSourceInput,
+} from './usePlatformizedSource';
 export type { SchemaCollectionOptions } from './schemaCollectionOptions';
-export { schemaSourceMutations } from './schemaSourceMutations';
+export { sourceMutations } from './sourceMutations';

package/src/schema/schemaCollectionOptions.ts

@@ -1,7 +1,13 @@
-import type { FiltersMap, SchemaSource } from '@wix/bex-core';
+import { sourceFetchData } from '@wix/bex-core';
+import type {
+  FiltersMap,
+  OffsetQuery,
+  OffsetQueryResult,
+  SchemaSource,
+} from '@wix/bex-core';
 import type { CollectionConfigWithConditionals } from '@wix/bex-core/react';
 
-type FetchData<T> = SchemaSource<T>['collectionConfig']['fetchData'];
+type FetchData<T> = (query: OffsetQuery) => Promise<OffsetQueryResult<T>>;
 
 /**
  * The collection options a schema-entry hook accepts — everything the source
@@ -21,7 +27,9 @@ export type SchemaCollectionOptions<T, F extends FiltersMap> = Omit<
   wrapFetchData?: (next: FetchData<T>) => FetchData<T>;
 };
 
-/** Merges the source's query config under the consumer's collection options.
+/** Builds the collection config from the source: the query fetches through the
+ *  source's backend, identity and labels come from the source, and the
+ *  consumer's options fill the rest.
  *  `options` is typed loosely — the hooks' option types already enforce the
  *  consumer surface, and TS can't infer `F` back through the conditional
  *  config type; callers pass the generics explicitly. */
@@ -33,12 +41,13 @@ export function schemaCollectionConfig<T, F extends FiltersMap>(
     T,
     F
   >;
-  const sourceConfig = source.collectionConfig;
+  const fetchData = sourceFetchData(source);
   return {
     ...rest,
-    ...sourceConfig,
-    fetchData: wrapFetchData
-      ? wrapFetchData(sourceConfig.fetchData)
-      : sourceConfig.fetchData,
+    queryName: source.collectionId,
+    paginationMode: source.paginationMode,
+    fetchData: wrapFetchData ? wrapFetchData(fetchData) : fetchData,
+    itemKey: source.itemKey,
+    itemName: source.itemName,
   } as unknown as CollectionConfigWithConditionals<T, F>;
 }

package/src/schema/sourceMutations.ts

@@ -0,0 +1,47 @@
+import type { SourceState } from '@wix/bex-core';
+import type { EditableTableMutationHandlers } from '../state/EditableTable';
+
+const newLocalId = () =>
+  `new-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+
+/**
+ * Row write handlers read from the source's state — the schema-entry default,
+ * so an editable table needs no `mutations` config. The schema loads before
+ * any row can be added or edited.
+ */
+export function sourceMutations<T>(
+  sourceState: SourceState<T>,
+): EditableTableMutationHandlers<T> {
+  const backend = () => {
+    const loaded = sourceState.loadedSchema;
+    if (!loaded) {
+      throw new Error('The schema is not loaded yet');
+    }
+    return loaded.backend;
+  };
+  const required = <F>(fn: F | undefined, action: string): F => {
+    if (!fn) {
+      throw new Error(`The source doesn't support ${action} items`);
+    }
+    return fn;
+  };
+
+  return {
+    createItem: () =>
+      ({ [sourceState.schema?.idField ?? '_id']: newLocalId() } as T),
+    submitCreate: (items) =>
+      Promise.all(
+        items.map((item) => required(backend().create, 'creating')(item)),
+      ),
+    submitUpdate: (items) =>
+      Promise.all(
+        items.map((item) => required(backend().update, 'updating')(item)),
+      ),
+    submitDelete: async (items) => {
+      await required(
+        backend().bulkDelete,
+        'deleting',
+      )(items.map((item) => sourceState.source.itemKey(item)));
+    },
+  };
+}

package/src/schema/useEditableTableCollection.ts

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { SourceState } from '@wix/bex-core';
 import type {
   CollectionOptimisticActionsBaseParams,
   FiltersMap,
@@ -12,6 +13,7 @@ import type {
   EditableTableMutationHandlers,
 } from '../state/EditableTable';
 import type { CellType } from '../state/EditableTable/types';
+import type { FieldsSourceProvider } from '../components/fieldsSourceProvider';
 import {
   useEditableTableCollection as useOpenEditableTableCollection,
   type EditableTableCollectionConfig,
@@ -21,7 +23,8 @@ import {
   schemaCollectionConfig,
   type SchemaCollectionOptions,
 } from './schemaCollectionOptions';
-import { schemaSourceMutations } from './schemaSourceMutations';
+import { sourceMutations } from './sourceMutations';
+import { attachesItself } from './usePlatformizedSource';
 
 export type SchemaEditableTableCollectionOptions<
   T,
@@ -36,19 +39,33 @@ export type SchemaEditableTableCollectionOptions<
   extraCellTypes?: CellType[];
 };
 
-/** An editable-table collection driven by a schema source: query config,
- *  columns, field management, and row writes all come from the source. */
-export const useEditableTableCollection = <
+/** An editable-table collection driven by a source: query config, columns,
+ *  field management, and row writes all come from the source. */
+export function useEditableTableCollection<
   T,
   F extends FiltersMap = OptionalFiltersMap,
 >(
   source: SchemaSource<T>,
   options?: SchemaEditableTableCollectionOptions<T, F>,
-): EditableTableState<T, F> => {
+): EditableTableState<T, F> {
   const container = useWixPatternsContainer();
-  const [schemaState] = useState(
-    () => new SchemaState<T>({ container, source }),
-  );
+  const [{ fieldsProvider, sourceState }] = useState<{
+    fieldsProvider: FieldsSourceProvider;
+    sourceState: SourceState<T>;
+  }>(() => {
+    const holder = new SourceState<T>({ container, source });
+    if (attachesItself(source)) {
+      // The schema attach path loads it otherwise; the derived row mutations
+      // read the loaded backend.
+      void holder.load();
+      return { fieldsProvider: source, sourceState: holder };
+    }
+    return {
+      fieldsProvider: new SchemaState<T>({ sourceState: holder }),
+      sourceState: holder,
+    };
+  });
+
   const {
     permissions,
     mutations,
@@ -60,11 +77,11 @@ export const useEditableTableCollection = <
   const state = useOpenEditableTableCollection<T, F>({
     ...schemaCollectionConfig<T, F>(source, rest),
     permissions,
-    mutations: mutations ?? schemaSourceMutations(schemaState),
+    mutations: mutations ?? sourceMutations(sourceState),
     optimisticActionParams,
     extraCellTypes,
   } as unknown as EditableTableCollectionConfig<T, F>);
 
-  useState(() => schemaState.setOnTable(state.toolbar));
+  useState(() => fieldsProvider.setOnTable(state.toolbar));
   return state;
-};
+}

package/src/schema/useGridCollection.ts

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { SourceState } from '@wix/bex-core';
 import type {
   FiltersMap,
   OptionalFiltersMap,
@@ -6,28 +7,34 @@ import type {
 } from '@wix/bex-core';
 import { useWixPatternsContainer } from '@wix/bex-core/react';
 import type { GridState } from '../state';
+import type { FieldsSourceProvider } from '../components/fieldsSourceProvider';
 import { useGridCollection as useOpenGridCollection } from '../hooks/useGridCollection';
 import { SchemaState } from '../components/SchemaSource/SchemaState';
 import {
   schemaCollectionConfig,
   type SchemaCollectionOptions,
 } from './schemaCollectionOptions';
+import { attachesItself } from './usePlatformizedSource';
 
-/** A grid collection driven by a schema source — the source's filters and
- *  field management attach to the toolbar even though a grid has no columns. */
-export const useGridCollection = <T, F extends FiltersMap = OptionalFiltersMap>(
+/** A grid collection driven by a source — the source's filters and field
+ *  management attach to the toolbar even though a grid has no columns. */
+export function useGridCollection<T, F extends FiltersMap = OptionalFiltersMap>(
   source: SchemaSource<T>,
   options?: SchemaCollectionOptions<T, F>,
-): GridState<T, F> => {
+): GridState<T, F> {
   const container = useWixPatternsContainer();
-  const [schemaState] = useState(
-    () => new SchemaState<T>({ container, source }),
+  const [fieldsProvider] = useState<FieldsSourceProvider>(() =>
+    attachesItself(source)
+      ? source
+      : new SchemaState<T>({
+          sourceState: new SourceState<T>({ container, source }),
+        }),
   );
 
   const state = useOpenGridCollection<T, F>(
     schemaCollectionConfig<T, F>(source, options),
   );
 
-  useState(() => schemaState.setOnTable(state.toolbar));
+  useState(() => fieldsProvider.setOnTable(state.toolbar));
   return state;
-};
+}

package/src/schema/useLayoutSwitchCollection.ts

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { SourceState } from '@wix/bex-core';
 import type {
   FiltersMap,
   OptionalFiltersMap,
@@ -12,6 +13,7 @@ import type {
   SpreadsheetLayoutConfig,
 } from '../state/LayoutSwitchState';
 import type { EditableTableMutationHandlers } from '../state/EditableTable';
+import type { FieldsSourceProvider } from '../components/fieldsSourceProvider';
 import {
   useLayoutSwitchCollection as useOpenLayoutSwitchCollection,
   type LayoutSwitchCollectionConfig,
@@ -21,7 +23,8 @@ import {
   schemaCollectionConfig,
   type SchemaCollectionOptions,
 } from './schemaCollectionOptions';
-import { schemaSourceMutations } from './schemaSourceMutations';
+import { sourceMutations } from './sourceMutations';
+import { attachesItself } from './usePlatformizedSource';
 
 export type SchemaLayoutSwitchCollectionOptions<
   T,
@@ -38,20 +41,34 @@ export type SchemaLayoutSwitchCollectionOptions<
   };
 };
 
-/** One collection and one toolbar driven by a schema source, shared by every
- *  enabled layout — the source attaches before any layout mounts, so a page
- *  opening in grid view has its fields and filters too. */
-export const useLayoutSwitchCollection = <
+/** One collection and one toolbar driven by a source, shared by every enabled
+ *  layout — the source attaches before any layout mounts, so a page opening
+ *  in grid view has its fields and filters too. */
+export function useLayoutSwitchCollection<
   T,
   F extends FiltersMap = OptionalFiltersMap,
 >(
   source: SchemaSource<T>,
   options?: SchemaLayoutSwitchCollectionOptions<T, F>,
-): LayoutSwitchState<T, F> => {
+): LayoutSwitchState<T, F> {
   const container = useWixPatternsContainer();
-  const [schemaState] = useState(
-    () => new SchemaState<T>({ container, source }),
-  );
+  const [{ fieldsProvider, sourceState }] = useState<{
+    fieldsProvider: FieldsSourceProvider;
+    sourceState: SourceState<T>;
+  }>(() => {
+    const holder = new SourceState<T>({ container, source });
+    if (attachesItself(source)) {
+      // The schema attach path loads it otherwise; the derived row mutations
+      // read the loaded backend.
+      void holder.load();
+      return { fieldsProvider: source, sourceState: holder };
+    }
+    return {
+      fieldsProvider: new SchemaState<T>({ sourceState: holder }),
+      sourceState: holder,
+    };
+  });
+
   const { table, grid, spreadsheet, ...rest } =
     options ?? ({} as SchemaLayoutSwitchCollectionOptions<T, F>);
 
@@ -62,12 +79,11 @@ export const useLayoutSwitchCollection = <
     spreadsheet: spreadsheet
       ? {
           ...spreadsheet,
-          mutations:
-            spreadsheet.mutations ?? schemaSourceMutations(schemaState),
+          mutations: spreadsheet.mutations ?? sourceMutations(sourceState),
         }
       : undefined,
   } as unknown as LayoutSwitchCollectionConfig<T, F>);
 
-  useState(() => schemaState.setOnTable(state.toolbar));
+  useState(() => fieldsProvider.setOnTable(state.toolbar));
   return state;
-};
+}

package/src/schema/usePlatformizedSource.ts

@@ -0,0 +1,111 @@
+import { useMemo } from 'react';
+import {
+  defineSchemaSource,
+  DataExtensionState,
+  parseFqdn,
+} from '@wix/bex-core';
+import type {
+  CollectionBackend,
+  DataExtensionOverrides,
+  SchemaSource,
+} from '@wix/bex-core';
+import type { FieldsSourceProvider } from '../components/fieldsSourceProvider';
+import type { ToolbarCollectionState } from '../state';
+import { CollectionFieldsSourceState } from '../state/CollectionFieldsSourceState';
+import { DataExtension } from '../components/DataExtension/DataExtension';
+import { dataExtensionFieldsSourceFrom } from '../components/DataExtension/dataExtensionFieldsSource';
+import { dataExtensionRendering } from '../components/DataExtension/dataExtensionRendering';
+
+export interface PlatformizedSourceInput<T> extends DataExtensionOverrides {
+  /** The entity's fqdn — becomes the source id and query name. */
+  fqdn: string;
+  /** The consumer's item data access. `find` drives the collection query —
+   *  the same code a classic `fetchData` runs. Writes are optional
+   *  capabilities; when present they feed the editable-table row mutations. */
+  backend: CollectionBackend<T>;
+  /** Row identity. Default: `item[idField]`. */
+  itemKey?: (item: T) => string;
+  /** Row display label. Default: `item[displayField]`. */
+  itemName?: (item: T) => string;
+  /** Default: `'id'` — the platformized standard. */
+  idField?: string;
+  /** Default: `idField`. */
+  displayField?: string;
+}
+
+type SelfAttachingSource<T> = SchemaSource<T> & FieldsSourceProvider;
+
+/**
+ * A source for a platformized entity: the consumer owns the items (via
+ * `backend`) and the source adds field management and rendering of the added
+ * fields on top. Recreated only when `fqdn` changes.
+ */
+export const usePlatformizedSource = <T = Record<string, unknown>>(
+  input: PlatformizedSourceInput<T>,
+): SchemaSource<T> => {
+  return useMemo(() => createPlatformizedSource(input), [input.fqdn]);
+};
+
+function createPlatformizedSource<T>(
+  input: PlatformizedSourceInput<T>,
+): SelfAttachingSource<T> {
+  const {
+    fqdn,
+    backend,
+    itemKey,
+    itemName,
+    idField = 'id',
+    displayField = idField,
+    ...overrides
+  } = input;
+
+  const base = defineSchemaSource<T>({
+    collectionId: fqdn,
+    itemKey,
+    itemName,
+    // The added fields arrive with the collection-adapter refit; until then
+    // the attach below renders them, and the schema carries identity only.
+    loadSchema: async () => ({
+      schema: { id: fqdn, idField, displayField, fields: {} },
+      backend,
+    }),
+  });
+
+  return {
+    ...base,
+    // Transitional (until the adapter refit): attach the fields area through
+    // the DataExtension glue — the same wiring as `dataExtensionTableSource`,
+    // with the fqdn coming from the source instead of the collection config.
+    setOnTable(toolbar: ToolbarCollectionState<any, any>) {
+      if (toolbar.collectionFieldsSource) {
+        return;
+      }
+      const dataExtension = new DataExtensionState({
+        container: toolbar.container,
+        fqdn: parseFqdn(fqdn),
+        closeSidePanel: toolbar.closeSidePanel,
+        ...overrides,
+      });
+      CollectionFieldsSourceState.setOnTable(toolbar, {
+        fieldsSource: dataExtensionFieldsSourceFrom({
+          dataExtension,
+          reportBi: toolbar.reportBi,
+          toExtendedFields: toolbar.collection.toExtendedFields,
+        }),
+        ...dataExtensionRendering({
+          dataExtension,
+          toolbar,
+          DataExtension,
+          props: overrides,
+        }),
+      });
+      DataExtension.syncTableCollectionProps(toolbar);
+    },
+  };
+}
+
+/** Transitional (until the adapter refit): platformized sources attach their
+ *  own fields area instead of going through SchemaState. */
+export const attachesItself = <T>(
+  source: SchemaSource<T>,
+): source is SelfAttachingSource<T> => 'setOnTable' in source;

package/src/schema/useTableCollection.ts

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { SourceState } from '@wix/bex-core';
 import type {
   FiltersMap,
   OptionalFiltersMap,
@@ -6,6 +7,7 @@ import type {
 } from '@wix/bex-core';
 import { useWixPatternsContainer } from '@wix/bex-core/react';
 import type { TableState } from '../state';
+import type { FieldsSourceProvider } from '../components/fieldsSourceProvider';
 import {
   useTableCollection as useOpenTableCollection,
   type TableCollectionConfig,
@@ -15,19 +17,24 @@ import {
   schemaCollectionConfig,
   type SchemaCollectionOptions,
 } from './schemaCollectionOptions';
+import { attachesItself } from './usePlatformizedSource';
 
-/** A table collection driven by a schema source: the source supplies the query
- *  config, and its fields UI attaches when the state is created. */
-export const useTableCollection = <
+/** A table collection driven by a source: the source supplies the query and
+ *  the fields area, and both attach when the state is created. */
+export function useTableCollection<
   T,
   F extends FiltersMap = OptionalFiltersMap,
 >(
   source: SchemaSource<T>,
   options?: SchemaCollectionOptions<T, F>,
-): TableState<T, F> => {
+): TableState<T, F> {
   const container = useWixPatternsContainer();
-  const [schemaState] = useState(
-    () => new SchemaState<T>({ container, source }),
+  const [fieldsProvider] = useState<FieldsSourceProvider>(() =>
+    attachesItself(source)
+      ? source
+      : new SchemaState<T>({
+          sourceState: new SourceState<T>({ container, source }),
+        }),
   );
 
   const state = useOpenTableCollection<T, F>(
@@ -37,6 +44,6 @@ export const useTableCollection = <
     >,
   );
 
-  useState(() => schemaState.setOnTable(state.toolbar));
+  useState(() => fieldsProvider.setOnTable(state.toolbar));
   return state;
-};
+}