Fix missing icons in workspace

Signed-off-by: Andrew Stein <steinlink@gmail.com>
finos · Aug 16, 2024 · 261a6b9 · 261a6b9
1 parent 1158491
commit 261a6b9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -223,6 +223,12 @@ jobs:
                   name: perspective-python-dist-${{ matrix.arch}}-${{ matrix.os }}-${{ matrix.python-version }}
                   path: rust/target/wheels/*.whl
 
+    # ,-,---.       .    .   .-,--.           .     .
+    #  '|___/ . . . |  ,-|    '|__/ . . ,-. ,-| . ,-| ,-.
+    #  ,|   \ | | | |  | |    .|    | | | | | | | | | |-'
+    # `-^---' `-' ' `' `-'    `'    `-| `-' `-' ' `-' `-'
+    #                                /|
+    #                               `-'
     build_emscripten_wheel:
         runs-on: ${{ matrix.os }}
         strategy:
@@ -249,7 +255,7 @@ jobs:
               with:
                   javascript: "false"
                   arch: ${{ matrix.arch }}
-                  manylinux: ${{ matrix.container && 'true' || 'false' }}
+                  manylinux: "false"
                   skip_cache: ${{ steps.config-step.outputs.SKIP_CACHE }}
 
             - name: Python Build Pyodide

diff --git a/docs/docs/js.md b/docs/docs/js.md
@@ -61,8 +61,8 @@ performance, as the plugin-assisted bundle version of Perspective:
 
 Perspective comes with bundler plugins for:
 
--   Webpack via `@finos/perspective-webpack-plugin`
 -   `esbuild` via `@finos/perspective-esbuild-plugin`
+-   Webpack via `@finos/perspective-webpack-plugin`
 
 ##### Webpack
 
@@ -243,15 +243,16 @@ It exports Perspective's data interfaces:
 
 `@finos/perspective` also exports process management functions, such as
 `worker()` and `websocket()` (in the browser) and `WebSocketServer()` (in
-Node.js). See the [API documentation](/obj/perspective.md) for a complete
-reference on all exported methods. This module is a dependency of
+Node.js). See the
+[API documentation](<[/obj/perspective.md](https://docs.rs/perspective-js/latest/perspective_js/)>)
+for a complete reference on all exported methods. This module is a dependency of
 `@finos/perspective-viewer`, and is not needed if you only intend to use
 `<perspective-viewer>` to visualize simple data.
 
 ### Importing in the browser
 
 `perspective` can be imported as an ES6 module and/or `require` syntax if you're
-using a bundler such as Webpack (and the `@finos/perspective-webpack-plugin`):
+using a bundler such as ESBuild (and the `@finos/perspective-esbuild-plugin`):
 
 ```javascript
 import perspective from "@finos/perspective";
@@ -311,7 +312,7 @@ view.to_csv().then((csv) => console.log(csv));
 view.to_arrow().then((arrow) => console.log(arrow));
 ```
 
-Via ES6 `await`/`async`
+Via `await`/`async`
 
 ```javascript
 async function print_data() {

diff --git a/rust/perspective-viewer/src/themes/icons.less b/rust/perspective-viewer/src/themes/icons.less
@@ -72,6 +72,8 @@ perspective-string-column-style {
     --close-icon--mask-image: url("../svg/close-icon.svg");
     --inactive-column-selector--content: url("../svg/checkbox-unchecked-icon.svg");
     --active-column-selector--content: url("../svg/checkbox-checked-icon.svg");
+    --select-arrow-light--background-image: url("../svg/dropdown-selector-light.svg");
+    --select-arrow-dark--background-image: url("../svg/dropdown-selector.svg");
     --overflow-hint-icon--content: "!";
     --reset-button-icon--content: "refresh";
     --save-button-icon--content: "save";

diff --git a/rust/perspective-viewer/src/themes/pro-dark.less b/rust/perspective-viewer/src/themes/pro-dark.less
@@ -68,7 +68,9 @@ perspective-string-column-style[theme="Pro Dark"] {
     --warning--color: #242526;
     --warning--background: var(--icon--color);
 
-    --select-arrow--background-image: url("../svg/dropdown-selector.svg");
+    --select-arrow--background-image: var(
+        --select-arrow-light--background-image
+    );
 
     // Column type indicators
     --float--column-type--color: #7dc3f0;

diff --git a/rust/perspective-viewer/src/themes/pro.less b/rust/perspective-viewer/src/themes/pro.less
@@ -94,7 +94,9 @@ perspective-string-column-style[theme="Pro Light"] {
     --warning--background: #042121;
     --warning--color: #fdfffd;
 
-    --select-arrow--background-image: url("../svg/dropdown-selector-light.svg");
+    --select-arrow--background-image: var(
+        --select-arrow-dark--background-image
+    );
 
     // TODO deprecate me
     --overflow-hint-icon--color: #fdfffd;

diff --git a/rust/perspective-viewer/src/themes/solarized-dark.less b/rust/perspective-viewer/src/themes/solarized-dark.less
@@ -48,7 +48,9 @@ perspective-string-column-style[theme="Solarized Dark"] {
     --inactive--border-color: var(--inactive--color);
     --plugin--background: #073642;
 
-    --select-arrow--background-image: url("../svg/dropdown-selector.svg");
+    --select-arrow--background-image: var(
+        --select-arrow-light--background-image
+    );
 }
 
 // @mixin perspective-viewer-solarized-dark--datagrid {}
@@ -61,9 +63,11 @@ perspective-string-column-style[theme="Solarized Dark"] {
     --d3fc-gridline--color: #002b36;
     --d3fc-legend--text: #93a1a1;
 
-    --d3fc-full--gradient: linear-gradient(#cb4b16 0%,
-            #073642 50%,
-            #268bd2 100%);
+    --d3fc-full--gradient: linear-gradient(
+        #cb4b16 0%,
+        #073642 50%,
+        #268bd2 100%
+    );
 
     // --d3fc-positive--gradient: linear-gradient(#073642 0%, #268bd2 100%);
     --d3fc-negative--gradient: linear-gradient(#cb4b16 0%, #073642 100%);