From bd64c692bf4970983909ba88eef716c0e80b7db1 Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Sat, 3 Jun 2023 16:11:27 -0600 Subject: [PATCH 1/3] remove important from tailwind config (WIP, website is broken) --- packages/components/.storybook/preview.tsx | 12 - packages/components/package.json | 16 +- .../components/DistributionsChart/index.tsx | 6 +- .../src/components/SquiggleChart.tsx | 7 +- .../src/components/SquiggleContainer.tsx | 28 -- .../src/components/SquiggleEditor.tsx | 5 +- .../components/SquigglePlayground/index.tsx | 67 ++- .../SquiggleViewer/ItemSettingsMenu.tsx | 17 +- packages/components/src/index.ts | 1 - packages/components/src/styles/base.css | 397 ------------------ packages/components/src/styles/forms.css | 182 -------- packages/components/src/styles/main.css | 25 +- .../tailwind-plugin.cts} | 28 +- packages/components/tailwind.config.ts | 9 + packages/components/tsconfig.json | 3 +- packages/hub/src/app/ClientApp.tsx | 11 +- packages/ui/README.md | 6 +- 17 files changed, 81 insertions(+), 739 deletions(-) delete mode 100644 packages/components/src/components/SquiggleContainer.tsx delete mode 100644 packages/components/src/styles/base.css delete mode 100644 packages/components/src/styles/forms.css rename packages/components/{tailwind.config.js => src/tailwind-plugin.cts} (50%) create mode 100644 packages/components/tailwind.config.ts diff --git a/packages/components/.storybook/preview.tsx b/packages/components/.storybook/preview.tsx index cdec2f2a67..7db8082159 100644 --- a/packages/components/.storybook/preview.tsx +++ b/packages/components/.storybook/preview.tsx @@ -1,17 +1,5 @@ -import * as React from "react"; - import "../src/styles/main.css"; -import { SquiggleContainer } from "../src/components/SquiggleContainer"; - -export const decorators = [ - (Story) => ( - - - - ), -]; - export const parameters = { actions: { argTypesRegex: "^on[A-Z].*" }, controls: { diff --git a/packages/components/package.json b/packages/components/package.json index 1fc7f149d2..f3123ce4b8 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -75,7 +75,7 @@ "scripts": { "start": "yarn dev", "dev": "storybook dev -p 6006", - "build:typescript": "rm -rf dist/esm && tsc", + "build:typescript": "rm -rf dist/src dist/tsconfig.tsbuildinfo && tsc", "build:css": "postcss ./src/styles/main.css -o ./dist/main.css", "build:lezer": "cd ./src/languageSupport; mkdir -p generated; lezer-generator ./squiggle.grammar --output generated/squiggle.ts", "build:storybook": "storybook build", @@ -125,14 +125,20 @@ "type": "module", "exports": { ".": { - "import": "./dist/esm/src/index.js", - "types": "./dist/types/src/index.d.ts" + "import": "./dist/src/index.js", + "types": "./dist/src/index.d.ts" }, "./dist/main.css": { "default": "./dist/main.css" + }, + "./main.css": { + "default": "./dist/main.css" + }, + "./plugin": { + "default": "./dist/tailwind-plugin.cjs" } }, - "module": "./dist/esm/src/index.js", - "types": "./dist/types/src/index.js", + "module": "./dist/src/index.js", + "types": "./dist/src/index.d.ts", "source": "./src/index.ts" } diff --git a/packages/components/src/components/DistributionsChart/index.tsx b/packages/components/src/components/DistributionsChart/index.tsx index d14f91cb72..43ba760238 100644 --- a/packages/components/src/components/DistributionsChart/index.tsx +++ b/packages/components/src/components/DistributionsChart/index.tsx @@ -1,7 +1,6 @@ import { clsx } from "clsx"; import * as d3 from "d3"; import isEqual from "lodash/isEqual.js"; -import * as React from "react"; import { FC, useCallback, useState } from "react"; import { @@ -28,7 +27,6 @@ import { SummaryTable } from "./SummaryTable.js"; import { Point } from "../../lib/draw/types.js"; import { DrawContext } from "../../lib/hooks/useCanvas.js"; -import { tailwindSelector } from "../SquiggleContainer.js"; export type DistributionsChartProps = { plot: SqDistributionsPlot; @@ -254,8 +252,7 @@ const InnerDistributionsChart: FC<{ render={() => (
)} - tailwindSelector={tailwindSelector} > = React.memo((props) => { const valueToRender = getValueToRender(resultAndBindings); - return ( - - - - ); + return ; }); diff --git a/packages/components/src/components/SquiggleContainer.tsx b/packages/components/src/components/SquiggleContainer.tsx deleted file mode 100644 index 88e2c47748..0000000000 --- a/packages/components/src/components/SquiggleContainer.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import React, { useContext } from "react"; - -type Props = { - children: React.ReactNode; -}; - -type SquiggleContextShape = { - containerized: boolean; -}; -const SquiggleContext = React.createContext({ - containerized: false, -}); - -export const tailwindSelector = "squiggle"; - -export const SquiggleContainer: React.FC = ({ children }) => { - const context = useContext(SquiggleContext); - - if (context.containerized) { - return <>{children}; - } else { - return ( - -
{children}
-
- ); - } -}; diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index 5259eb68e8..b27c09dab2 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -4,7 +4,6 @@ import { useMaybeControlledValue } from "../lib/hooks/index.js"; import { SquiggleArgs, useSquiggle } from "../lib/hooks/useSquiggle.js"; import { getErrors, getValueToRender } from "../lib/utility.js"; import { CodeEditor } from "./CodeEditor.js"; -import { SquiggleContainer } from "./SquiggleContainer.js"; import { SquiggleViewer, SquiggleViewerProps } from "./SquiggleViewer/index.js"; export type SquiggleEditorProps = SquiggleArgs & { @@ -25,7 +24,7 @@ export const SquiggleEditor: React.FC = (props) => { const errors = getErrors(resultAndBindings.result); return ( - +
= (props) => { {props.hideViewer ? null : ( )} - +
); }; diff --git a/packages/components/src/components/SquigglePlayground/index.tsx b/packages/components/src/components/SquigglePlayground/index.tsx index fe3c21feb1..719c836374 100644 --- a/packages/components/src/components/SquigglePlayground/index.tsx +++ b/packages/components/src/components/SquigglePlayground/index.tsx @@ -25,7 +25,6 @@ import { useMaybeControlledValue, useSquiggle } from "../../lib/hooks/index.js"; import { JsImports } from "../../lib/jsImports.js"; import { getErrors, getValueToRender, isMac } from "../../lib/utility.js"; import { CodeEditor, CodeEditorHandle } from "../CodeEditor.js"; -import { SquiggleContainer } from "../SquiggleContainer.js"; import { SquiggleViewer, SquiggleViewerProps, @@ -217,41 +216,39 @@ export const SquigglePlayground: React.FC = (props) => { }, []); return ( - - - -