Merge commit '7f1f2dbad24c6f1fe2b034fbb64c950f24318d50' into block-notes

src/frontend/lib/components/TableColumnSelect.tsx

@@ -23,7 +23,7 @@ export function TableColumnSelect({
         <Menu.Label>{t`Select Columns`}</Menu.Label>
         <Divider />
         {columns
-          .filter((col) => col.switchable ?? true)
+          .filter((col) => (col.switchable ?? true) && !col.propHidden)
           .map((col) => (
             <Menu.Item key={col.accessor}>
               <Checkbox

src/frontend/lib/types/Tables.tsx

@@ -84,7 +84,7 @@ export type TableState = {
  * @param editable - Whether the value of this column can be edited
  * @param definition - Optional field definition for the column
  * @param render - A custom render function
- * @param filter - A custom filter function
+ * @param filter - Filter name (string) to look up from tableFilters and attach an inline icon, or a custom render function for the filter popover
  * @param filtering - Whether the column is filterable
  * @param width - The width of the column
  * @param minWidth - The minimum width of the column
@@ -109,7 +109,10 @@ export type TableColumnProps<T = any> = {
   editable?: boolean;
   definition?: ApiFormFieldType;
   render?: (record: T, index?: number) => any;
-  filter?: any;
+  filter?:
+    | string
+    | string[]
+    | (({ close }: { close: () => void }) => ReactNode);
   filtering?: boolean;
   width?: number;
   minWidth?: string | number;