Merge pull request #109 from UW-Macrostrat/fix-data-sheet-error

Fix data sheet error

Author: davenquinn

packages/data-sheet/CHANGELOG.md

@@ -4,6 +4,11 @@ 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
+
 ## [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/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;