Merge branch 'cell-distance-explorer' of https://github.com/hubmapcon…

…sortium/hra-ui into landing-page
hubmapconsortium · Apr 4, 2024 · 59d7841 · 59d7841
2 parents 5f85d28 + fd4a859
commit 59d7841
Show file tree

Hide file tree

Showing 9 changed files with 3,797 additions and 3,420 deletions.
diff --git a/.storybook/fixes/arg-types.ts b/.storybook/fixes/arg-types.ts
@@ -43,7 +43,7 @@ export function fixArgTypes(): ArgTypesEnhancer<AngularRenderer, Args> {
     const exclude = [...(context.parameters['controls']?.exclude ?? [])];
 
     for (const [key, type] of Object.entries(argTypes)) {
-      switch (type['table'].category) {
+      switch (type['table']?.category) {
         case 'inputs':
           const defaultValue = parseDefaultValue(type);
           if (defaultValue !== type.defaultValue) {

diff --git a/apps/ccf-eui/src/themes/_default_light.scss b/apps/ccf-eui/src/themes/_default_light.scss
@@ -8,8 +8,8 @@ $default-light-palette: utility.add-colors(
     main: #444a65,
     light-disabled: #e0e0e0,
     contrast: (
-      main: mat.$private-dark-primary-text,
-      light-disabled: mat.$private-dark-primary-text,
+      main: rgba(black, 0.87),
+      light-disabled: rgba(black, 0.87),
     ),
   )
 );

diff --git a/apps/ccf-eui/src/themes/_gtex_light.scss b/apps/ccf-eui/src/themes/_gtex_light.scss
@@ -8,8 +8,8 @@ $gtex-light-palette: utility.add-colors(
     main: #46a4ad,
     light-disabled: #e0e0e0,
     contrast: (
-      main: mat.$private-dark-primary-text,
-      light-disabled: mat.$private-dark-primary-text,
+      main: rgba(black, 0.87),
+      light-disabled: rgba(black, 0.87),
     ),
   )
 );

diff --git a/apps/ccf-eui/src/themes/_hubmap_light.scss b/apps/ccf-eui/src/themes/_hubmap_light.scss
@@ -9,8 +9,8 @@ $hubmap-light-palette: utility.add-colors(
     main: #444a65,
     light-disabled: #e0e0e0,
     contrast: (
-      main: mat.$private-dark-primary-text,
-      light-disabled: mat.$private-dark-primary-text,
+      main: rgba(black, 0.87),
+      light-disabled: rgba(black, 0.87),
     ),
   )
 );

diff --git a/apps/ccf-rui/src/themes/_gtex_light.scss b/apps/ccf-rui/src/themes/_gtex_light.scss
@@ -9,8 +9,8 @@ $gtex-light-palette: utility.add-colors(
     main: #46a4ad,
     light-disabled: #e0e0e0,
     contrast: (
-      main: mat.$private-dark-primary-text,
-      light-disabled: mat.$private-dark-primary-text,
+      main: rgba(black, 0.87),
+      light-disabled: rgba(black, 0.87),
     ),
   )
 );

diff --git a/apps/ccf-rui/src/themes/_light.scss b/apps/ccf-rui/src/themes/_light.scss
@@ -13,8 +13,8 @@ $primary-colors: utility.add-colors(
     contrast: (
       'white': black,
       'black': white,
-      light-header: mat.$private-dark-primary-text,
-      light-disabled: mat.$private-dark-primary-text,
+      light-header: rgba(black, 0.87),
+      light-disabled: rgba(black, 0.87),
     ),
   )
 );

diff --git a/libs/components/molecules/src/lib/interactive-svg/interactive-svg.component.spec.ts b/libs/components/molecules/src/lib/interactive-svg/interactive-svg.component.spec.ts
@@ -32,7 +32,7 @@ describe('InteractiveSvgComponent', () => {
     shallow = new Shallow(InteractiveSvgComponent).dontMock(OverlayModule);
     renderer = mock<Renderer2>();
 
-    mockedInject.mockReset().mockReturnValue(renderer);
+    mockedInject.mockReset().mockReturnValue(renderer as never);
     renderer.listen.mockReturnValue(() => undefined);
     svg.querySelector.mockReturnValue(crosswalk);
     crosswalk.querySelector.mockReturnValue(nodeList[0]);