Skip to content

Commit

Permalink
Merge branch 'main' into edit-ssr
Browse files Browse the repository at this point in the history
* main:
  Updated data sheet test page
  Updated data sheet colors components
  Enable save/reset functionality for data sheet
  Added rudimentary fill-down functionality
  Added selection clearing
  Derive focused cell from selection
  Added a bit more description
  Basic testing data sheet
  • Loading branch information
davenquinn committed Nov 6, 2023
2 parents 775982c + b5c80db commit 32f142b
Show file tree
Hide file tree
Showing 16 changed files with 503 additions and 175 deletions.
20 changes: 20 additions & 0 deletions .yarn/sdks/prettier/bin-prettier.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

const relPnpApiPath = "../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier/bin-prettier.js
require(absPnpApiPath).setup();
}
}

// Defer to the real prettier/bin-prettier.js your application uses
module.exports = absRequire(`prettier/bin-prettier.js`);
Empty file modified .yarn/sdks/prettier/index.js
100755 → 100644
Empty file.
5 changes: 3 additions & 2 deletions .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "prettier",
"version": "2.8.3-sdk",
"version": "2.8.8-sdk",
"main": "./index.js",
"type": "commonjs"
"type": "commonjs",
"bin": "./bin-prettier.js"
}
6 changes: 3 additions & 3 deletions .yarn/sdks/typescript/lib/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require typescript/lib/typescript.js
// Setup the environment to be able to require typescript
require(absPnpApiPath).setup();
}
}

// Defer to the real typescript/lib/typescript.js your application uses
module.exports = absRequire(`typescript/lib/typescript.js`);
// Defer to the real typescript your application uses
module.exports = absRequire(`typescript`);
6 changes: 5 additions & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
"name": "typescript",
"version": "5.2.2-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
"type": "commonjs",
"bin": {
"tsc": "./bin/tsc",
"tsserver": "./bin/tsserver"
}
}
10 changes: 5 additions & 5 deletions packages/data-sheet-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"main": "src/index.ts",
"license": "ISC",
"dependencies": {
"@blueprintjs/core": "4",
"@blueprintjs/icons": "^5.3.0",
"@blueprintjs/table": "^5.0.17",
"@macrostrat/data-sheet": "^1.0.0",
"@blueprintjs/core": "^4",
"@blueprintjs/table": "^4",
"@macrostrat/data-sheet": "workspace:^2.0.0-a1",
"@macrostrat/hyper": "^2.2.1",
"@macrostrat/ui-components": "workspace:^3.0.0",
"chroma-js": "^2.4.2"
"chroma-js": "^2.4.2",
"react": "^18.2.0"
}
}
Loading

0 comments on commit 32f142b

Please sign in to comment.