Merge branch 'main' into readme

Author: davidsklar99

packages/data-sheet/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.1] - 2025-06-25
+
+- Fix issue with exports and Parcel
+- Improve some types
+- PostgREST sheet: set default ordering to `identityKey` ascending
+
 ## [2.1.0] - 2025-06-25
 
 - Add filtering to PostgREST table

packages/data-sheet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/data-sheet",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Scalable data sheet with optional editing capabilities",
   "type": "module",
   "source": "src/index.ts",

packages/data-sheet/src/components/index.ts

@@ -1,3 +1,4 @@
 export * from "./editor-popup";
 export * from "./colors";
 export * from "./text-areas";
+export * from "./actions";

packages/data-sheet/src/core.ts

@@ -16,11 +16,10 @@ import "@blueprintjs/table/lib/css/table.css";
 import hyper from "@macrostrat/hyper";
 import update from "immutability-helper";
 import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
-import { EditorPopup, handleSpecialKeys } from "./components";
+import { EditorPopup, handleSpecialKeys, DataSheetAction } from "./components";
 import styles from "./main.module.sass";
 import {
   ColumnSpec,
-  ColumnSpecOptions,
   DataSheetProvider,
   DataSheetProviderProps,
   DataSheetStore,
@@ -29,10 +28,6 @@ import {
   useStoreAPI,
   VisibleCells,
 } from "./provider";
-import { DataSheetAction } from "./components/actions";
-
-export type { ColumnSpec, ColumnSpecOptions };
-export * from "./components";
 
 const h = hyper.styled(styles);
 
@@ -157,7 +152,7 @@ function _DataSheet<T>({
   );
 
   const onAddRow = useCallback(() => {
-    setUpdatedData((updatedData) => {
+    setUpdatedData((updatedData: any[]): any[] => {
       const ix = Math.max(updatedData.length, data.length);
       const addRowSpec = { [ix]: { $set: {} } };
       const newUpdatedData = update(updatedData, addRowSpec);

packages/data-sheet/src/index.ts

@@ -1,2 +1,4 @@
 export * from "./core";
 export * from "./postgrest-table";
+export * from "./components";
+export * from "./provider";

packages/data-sheet/src/postgrest-table/data-loaders.ts

@@ -25,6 +25,12 @@ interface LazyLoaderState<T> {
   initialized: boolean;
 }
 
+export interface PostgrestOrder<T> {
+  key: string;
+  ascending?: boolean;
+  nullsFirst?: boolean;
+}
+
 type LazyLoaderAction<T> =
   | { type: "start-loading" }
   | { type: "loaded"; data: T[]; offset: number; totalSize: number }
@@ -130,7 +136,7 @@ interface QueryConfig {
   count?: "exact" | "estimated";
   limit?: number;
   offset?: number;
-  order?: { key: string; ascending: boolean };
+  order?: PostgrestOrder<any>;
   after?: any;
   filter?: (
     query: PostgrestFilterBuilder<any, any, any>,
@@ -158,12 +164,11 @@ function buildQuery<T>(
   }
 
   if (config.order != null) {
-    query = query.order(config.order.key, {
-      ascending: config.order.ascending,
-    });
+    const { key: orderKey, ...rest } = config.order;
+    query = query.order(orderKey, rest);
     if (config.after != null) {
-      const op = config.order.ascending ? "gt" : "lt";
-      query = query[op](config.order.key, config.after);
+      const op = (rest.ascending ?? true) ? "gt" : "lt";
+      query = query[op](orderKey, config.after);
     }
   }
   if (config.limit != null) {

packages/data-sheet/src/postgrest-table/index.ts

@@ -1,9 +1,9 @@
 import { Toaster, HotkeysProvider } from "@blueprintjs/core";
 import hyper from "@macrostrat/hyper";
 import styles from "./main.module.sass";
-import { DataSheet, ColorCell, getRowsToDelete } from "../core"; //getRowsToDelete
+import { DataSheet, getRowsToDelete } from "../core"; //getRowsToDelete
 import { LithologyTag, Tag, TagSize } from "@macrostrat/data-components";
-import { usePostgRESTLazyLoader } from "./data-loaders";
+import { PostgrestOrder, usePostgRESTLazyLoader } from "./data-loaders";
 import { Spinner } from "@blueprintjs/core";
 
 export * from "./data-loaders";
@@ -21,6 +21,7 @@ import type {
   GenericTable,
   GenericView,
 } from "@supabase/postgrest-js/dist/cjs/types";
+import { ColorCell } from "../components";
 
 const h = hyper.styled(styles);
 
@@ -35,9 +36,10 @@ interface PostgRESTTableViewProps<T extends object>
   endpoint: string;
   table: string;
   columnOptions?: any;
-  order?: any;
+  order?: PostgrestOrder<T>;
   columns?: string;
   editable?: boolean;
+  identityKey?: string;
   filter(
     query: PostgrestFilterBuilder<T, any, any>,
   ): PostgrestFilterBuilder<T, any, any>;
@@ -67,7 +69,7 @@ function _PostgRESTTableView<T>({
     endpoint,
     table,
     {
-      order,
+      order: order ?? { key: identityKey, ascending: true },
       columns,
       filter,
     },
@@ -216,11 +218,11 @@ export function ExpandedLithologies({ value, onChange }) {
             h(
               "td.basis-col",
               d.basis_col?.map((d) => {
-                return h(Tag, { size: TagSize.Small, key: d }, [
-                  h("span.tag-header", "Column"),
-                  " ",
-                  h("code", d),
-                ]);
+                return h(Tag, {
+                  size: TagSize.Small,
+                  key: d,
+                  name: h([h("span.tag-header", "Column"), " ", h("code", d)]),
+                });
               }),
             ),
           ]);

packages/data-sheet/src/provider.ts

@@ -61,10 +61,12 @@ export interface DataSheetComputedStore {
 
 type DataSheetVals<T> = DataSheetState<T> & DataSheetCoreProps<T>;
 
+type StateUpdater<T> = T[] | ((state: T[]) => T[]);
+
 export interface DataSheetStore<T> extends DataSheetVals<T> {
   setSelection(selection: Region[]): void;
   onDragValue(cell: FocusedCellCoordinates | null): void;
-  setUpdatedData(data: T[]): void;
+  setUpdatedData(data: StateUpdater<T>): void;
   onCellEdited(rowIndex: number, columnName: string, value: any): void;
   onColumnsReordered(oldIndex: number, newIndex: number, length: number): void;
   moveFocusedCell(direction: "up" | "down" | "left" | "right"): void;
@@ -178,7 +180,7 @@ export function DataSheetProvider<T>({
               };
             });
           },
-          setUpdatedData(data: T[] | ((state: T[]) => T[])) {
+          setUpdatedData(data: StateUpdater<T>) {
             if (Array.isArray(data)) {
               set({ updatedData: data });
             } else {

packages/data-sheet/src/utils/column-spec.ts

@@ -1,3 +1,5 @@
+import type { ColumnSpec, ColumnSpecOptions } from "../provider";
+
 const defaultRenderers = {
   string: (d) => d,
   number: (d) => d?.toFixed(2),
@@ -104,7 +106,7 @@ export function generateDefaultColumnSpec<T>(
 
 export function generateColumnSpec<T>(
   data: T[],
-  options: ColumnSpecOptions,
+  options: ColumnSpecOptions<T>,
 ): ColumnSpec[] {
   /** Generate a column spec from a dataset */
   const { overrides = {}, nRows = 10, omitColumns, includeColumns } = options;

packages/map-interface/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.2] - 2025-06-26
+
+Bugfix for DevMapPage when applying custom styles
+
 ## [1.3.1] - 2025-06-25
 
 Small improvements to types and styles