From 6f57db86425c0ea7c7cd87346e755814c42eeb4f Mon Sep 17 00:00:00 2001 From: alanv Date: Wed, 14 Feb 2024 13:42:05 -0600 Subject: [PATCH] Fix merge issue --- core/package-lock.json | 14 +++++++------- core/package.json | 2 +- .../ProductNavigation/ProductNavigation.tsx | 5 +++-- .../ProductNavigation/productNavigation.scss | 15 ++++++++++----- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index 85b2f0147c9..9d00f9b5ee8 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -8,7 +8,7 @@ "name": "labkey-core", "version": "0.0.0", "dependencies": { - "@labkey/components": "3.20.0", + "@labkey/components": "3.21.0", "@labkey/themes": "1.3.3" }, "devDependencies": { @@ -3339,9 +3339,9 @@ } }, "node_modules/@labkey/components": { - "version": "3.20.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.20.0.tgz", - "integrity": "sha512-rHxquEKNTSlOTLy4K37x4XqffqgsZOG+P9pJu9bTJKEUPAWuqVE+HOkAZWzPx0dfteeeW4expDtDbPzjrG9i/g==", + "version": "3.21.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.21.0.tgz", + "integrity": "sha512-Kmwx+eKuF9ak+MR31mezqmH3xlWDC1lDrNwZoY2GY0XakXi8FA0uQZTge/0M5xg+CzFfcXBzsYG6lnKNFJOmbg==", "dependencies": { "@labkey/api": "1.29.0", "@testing-library/jest-dom": "~5.17.0", @@ -19555,9 +19555,9 @@ } }, "@labkey/components": { - "version": "3.20.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.20.0.tgz", - "integrity": "sha512-rHxquEKNTSlOTLy4K37x4XqffqgsZOG+P9pJu9bTJKEUPAWuqVE+HOkAZWzPx0dfteeeW4expDtDbPzjrG9i/g==", + "version": "3.21.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.21.0.tgz", + "integrity": "sha512-Kmwx+eKuF9ak+MR31mezqmH3xlWDC1lDrNwZoY2GY0XakXi8FA0uQZTge/0M5xg+CzFfcXBzsYG6lnKNFJOmbg==", "requires": { "@labkey/api": "1.29.0", "@testing-library/jest-dom": "~5.17.0", diff --git a/core/package.json b/core/package.json index 1115b478f54..9d9013d4069 100644 --- a/core/package.json +++ b/core/package.json @@ -54,7 +54,7 @@ } }, "dependencies": { - "@labkey/components": "3.20.0", + "@labkey/components": "3.21.0", "@labkey/themes": "1.3.3" }, "devDependencies": { diff --git a/core/src/client/ProductNavigation/ProductNavigation.tsx b/core/src/client/ProductNavigation/ProductNavigation.tsx index 2a30942f5d5..8f8136d2273 100644 --- a/core/src/client/ProductNavigation/ProductNavigation.tsx +++ b/core/src/client/ProductNavigation/ProductNavigation.tsx @@ -1,4 +1,4 @@ -import React, { FC, memo } from 'react'; +import React, { FC, memo, useRef } from 'react'; import { ProductNavigationMenu } from '@labkey/components'; import './productNavigation.scss'; @@ -12,8 +12,9 @@ interface Props { } export const ProductNavigation: FC = memo(props => { + const menuRef = useRef(); if (props.context.show) { - return ; + return ; } else { return null; } diff --git a/core/src/client/ProductNavigation/productNavigation.scss b/core/src/client/ProductNavigation/productNavigation.scss index 489cc39c5ad..9cdc9ba4477 100644 --- a/core/src/client/ProductNavigation/productNavigation.scss +++ b/core/src/client/ProductNavigation/productNavigation.scss @@ -2,10 +2,15 @@ @import "../../../node_modules/@labkey/components/dist/assets/scss/theme/navbar"; @import "../../../node_modules/@labkey/components/dist/assets/scss/theme/product-navigation"; -#headerProductDropdown .dropdown-menu-right { - padding: 0; - +#headerProductDropdown { + // We render the ProductNavigation within a bootstrap dropdown button in LKS, which makes the navbar-icon-connector + // a redundant element that we need to hide. .navbar-icon-connector { - right: 6px; + display: none; + } + + .navbar-menu__content { + top: 0; + margin: 0; } -} \ No newline at end of file +}