1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

chore: extract tooltip into package

- chore: add sanity check unit test
- chore: added tailwind.config.js to fix build
- chore: .swcrc added for tests to pass
- chore(deps): sass is not a dependency
- fix: manually import the tooltip css to fix tooltips not showing up
- chore: Run lint:fix against code
- chore: Fix use of mock in @k8slens/core

Signed-off-by: Gabriel <gaccettola@mirantis.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Gabriel 2023-04-12 20:16:57 +02:00 committed by Sebastian Malton
parent c7df928acc
commit 01059d8cb1
42 changed files with 268 additions and 101 deletions

56
package-lock.json generated
View File

@ -3962,6 +3962,10 @@
"resolved": "packages/utility-features/test-utils",
"link": true
},
"node_modules/@k8slens/tooltip": {
"resolved": "packages/ui-components/tooltip",
"link": true
},
"node_modules/@k8slens/typescript": {
"resolved": "packages/infrastructure/typescript",
"link": true
@ -35063,6 +35067,7 @@
"@k8slens/run-many": "^1.0.0-alpha.1",
"@k8slens/startable-stoppable": "^1.0.0-alpha.1",
"@k8slens/test-utils": "^1.0.0-alpha.1",
"@k8slens/tooltip": "^1.0.0-alpha.0",
"@k8slens/utilities": "^1.0.0-alpha.1",
"@ogre-tools/fp": "^15.3.1",
"@ogre-tools/injectable": "^15.3.1",
@ -36601,6 +36606,57 @@
"react-dom": "^17.0.2"
}
},
"packages/ui-components/tooltip": {
"name": "@k8slens/tooltip",
"version": "1.0.0-alpha.0",
"license": "MIT",
"devDependencies": {
"@async-fn/jest": "^1.6.4",
"@k8slens/eslint-config": "6.5.0-alpha.1",
"@k8slens/react-testing-library-discovery": "^1.0.0-alpha.0"
},
"peerDependencies": {
"@k8slens/feature-core": "^6.5.0-alpha.0",
"@k8slens/utilities": "^1.0.0-alpha.1",
"@ogre-tools/fp": "^15.1.2",
"@ogre-tools/injectable": "^15.1.2",
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
"auto-bind": "^4.0.0",
"lodash": "^4.17.21",
"mobx": "^6.8.0",
"mobx-react": "^7.6.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
},
"packages/ui-components/tooltip/node_modules/@k8slens/eslint-config": {
"version": "6.5.0-alpha.1",
"resolved": "https://registry.npmjs.org/@k8slens/eslint-config/-/eslint-config-6.5.0-alpha.1.tgz",
"integrity": "sha512-6DdfKe/iafX85GBK/UlKgz29FOIOp/UVS03bFGLyw7Vmm7pauB0FEHTAdbr3g1qG/Zcn6nxhOM3uqQyRY/uEyA==",
"dev": true,
"bin": {
"lens-lint": "bin/lint"
},
"peerDependencies": {
"@typescript-eslint/eslint-plugin": ">= 5",
"@typescript-eslint/parser": ">= 5",
"eslint": ">= 7",
"eslint-config-airbnb-typescript": ">= 17",
"eslint-config-prettier": ">= 8",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-import": ">= 2",
"eslint-plugin-jest": ">= 27",
"eslint-plugin-jsx-a11y": ">= 6",
"eslint-plugin-no-unsanitized": ">= 4.0.2",
"eslint-plugin-prettier": ">= 4",
"eslint-plugin-react-hooks": ">= 4",
"eslint-plugin-security": ">= 1.6.0",
"eslint-plugin-simple-import-sort": ">= 7",
"eslint-plugin-unused-imports": ">= 2",
"eslint-plugin-xss": ">= 0.1.12",
"prettier": ">= 2"
}
},
"packages/utility-features/react-testing-library-discovery": {
"name": "@k8slens/react-testing-library-discovery",
"version": "1.0.0-alpha.3",

View File

@ -84,7 +84,7 @@
"<rootDir>/static/build"
],
"setupFiles": [
"<rootDir>/src/jest.setup.ts",
"<rootDir>/src/jest.setup.tsx",
"jest-canvas-mock"
],
"globalSetup": "<rootDir>/src/jest.timezone.ts",
@ -321,6 +321,7 @@
"@k8slens/run-many": "^1.0.0-alpha.1",
"@k8slens/startable-stoppable": "^1.0.0-alpha.1",
"@k8slens/test-utils": "^1.0.0-alpha.1",
"@k8slens/tooltip": "^1.0.0-alpha.0",
"@k8slens/utilities": "^1.0.0-alpha.1",
"@ogre-tools/fp": "^15.3.1",
"@ogre-tools/injectable": "^15.3.1",

View File

@ -64,7 +64,7 @@ export const ConfirmDialog = Object.assign(_ConfirmDialog, {
});
export * from "../../renderer/components/icon";
export * from "../../renderer/components/tooltip";
export * from "@k8slens/tooltip";
export * from "../../renderer/components/tabs";
export * from "../../renderer/components/table";
export * from "../../renderer/components/badge";

View File

@ -9,6 +9,8 @@ import { TextEncoder, TextDecoder as TextDecoderNode } from "util";
import glob from "glob";
import path from "path";
import { enableMapSet, setAutoFreeze } from "immer";
import type * as K8slensTooltip from "@k8slens/tooltip";
import React from "react";
declare global {
interface InjectablePaths {
@ -53,8 +55,25 @@ global.ResizeObserver = class {
};
jest.mock("./renderer/components/monaco-editor/monaco-editor");
jest.mock("./renderer/components/tooltip/withTooltip");
jest.mock("@k8slens/tooltip", () => ({
...jest.requireActual("@k8slens/tooltip"),
withTooltip: (Target => ({ tooltip, tooltipOverrideDisabled, ...props }: any) => {
if (tooltip) {
const testId = props["data-testid"];
return (
<>
<Target {...props} />
<div data-testid={testId && `tooltip-content-for-${testId}`}>
{tooltip.children || tooltip}
</div>
</>
);
}
return <Target {...props} />;
}) as typeof K8slensTooltip.withTooltip,
}));
jest.mock("monaco-editor");
const getInjectables = (environment: "renderer" | "main", filePathGlob: string) => [

View File

@ -16,7 +16,7 @@ import { KubeObjectListLayout } from "../kube-object-list-layout";
import type { KubeEvent, KubeEventApi, KubeEventData } from "../../../common/k8s-api/endpoints/events.api";
import type { TableSortCallbacks, TableSortParams } from "../table";
import type { HeaderCustomizer } from "../item-object-list";
import { Tooltip } from "../tooltip";
import { Tooltip } from "@k8slens/tooltip";
import { Link } from "react-router-dom";
import type { IClassName } from "@k8slens/utilities";
import { cssNames, stopPropagation } from "@k8slens/utilities";

View File

@ -11,7 +11,7 @@ import { Icon } from "../icon";
import { observer } from "mobx-react";
import { Input, InputValidators } from "../input";
import { SubTitle } from "../layout/sub-title";
import { TooltipPosition } from "../tooltip";
import { TooltipPosition } from "@k8slens/tooltip";
import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
import { withInjectables } from "@ogre-tools/injectable-react";

View File

@ -5,7 +5,7 @@
import styles from "./subnamespace-badge.module.scss";
import React from "react";
import { Tooltip } from "../tooltip";
import { Tooltip } from "@k8slens/tooltip";
import { cssNames } from "@k8slens/utilities";
interface SubnamespaceBadgeProps extends React.HTMLAttributes<HTMLSpanElement> {

View File

@ -12,7 +12,7 @@ import { KubeObjectListLayout } from "../kube-object-list-layout";
import type { Node } from "../../../common/k8s-api/endpoints/node.api";
import { formatNodeTaint } from "../../../common/k8s-api/endpoints/node.api";
import { LineProgress } from "../line-progress";
import { Tooltip, TooltipPosition } from "../tooltip";
import { Tooltip, TooltipPosition } from "@k8slens/tooltip";
import kebabCase from "lodash/kebabCase";
import upperFirst from "lodash/upperFirst";
import { KubeObjectStatusIcon } from "../kube-object-status-icon";

View File

@ -20,7 +20,7 @@ import { onMultiSelectFor, Select } from "../../../select";
import { Wizard, WizardStep } from "../../../wizard";
import { ObservableHashSet, iter } from "@k8slens/utilities";
import { Input } from "../../../input";
import { TooltipPosition } from "../../../tooltip";
import { TooltipPosition } from "@k8slens/tooltip";
import type { Subject } from "../../../../../common/k8s-api/endpoints/types/subject";
import type { ClusterRoleBindingDialogState } from "./state.injectable";
import type { ClusterRoleStore } from "../../+cluster-roles/store";

View File

@ -15,7 +15,7 @@ import type { IComputedValue } from "mobx";
import { makeObservable, observable, reaction } from "mobx";
import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter";
import { Icon } from "../icon";
import { TooltipPosition } from "../tooltip";
import { TooltipPosition } from "@k8slens/tooltip";
import { withInjectables } from "@ogre-tools/injectable-react";
import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";

View File

@ -29,7 +29,7 @@ import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.inject
import eventStoreInjectable from "../+events/store.injectable";
import podStoreInjectable from "./store.injectable";
import { NamespaceSelectBadge } from "../+namespaces/namespace-select-badge";
import { Tooltip } from "../tooltip";
import { Tooltip } from "@k8slens/tooltip";
enum columnId {
name = "name",

View File

@ -9,7 +9,7 @@ import React, { useEffect, useRef, useState } from "react";
import { action, observable } from "mobx";
import { observer } from "mobx-react";
import { cssNames } from "@k8slens/utilities";
import { withTooltip } from "../tooltip";
import { withTooltip } from "@k8slens/tooltip";
export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement> {
small?: boolean;

View File

@ -7,7 +7,7 @@ import "./button.scss";
import type { ButtonHTMLAttributes } from "react";
import React from "react";
import { cssNames } from "@k8slens/utilities";
import { withTooltip } from "../tooltip";
import { withTooltip } from "@k8slens/tooltip";
export interface ButtonProps extends ButtonHTMLAttributes<any> {
label?: React.ReactNode;

View File

@ -16,7 +16,7 @@ import { Menu, MenuItem } from "../menu";
import { observable } from "mobx";
import { withInjectables } from "@ogre-tools/injectable-react";
import dockStoreInjectable from "./dock/store.injectable";
import { Tooltip, TooltipPosition } from "../tooltip";
import { Tooltip, TooltipPosition } from "@k8slens/tooltip";
import isMacInjectable from "../../../common/vars/is-mac.injectable";
import autoBindReact from "auto-bind/react";

View File

@ -14,7 +14,7 @@ import { observer } from "mobx-react";
import type { AvatarProps } from "../avatar";
import { Avatar } from "../avatar";
import { Icon } from "../icon";
import { Tooltip } from "../tooltip";
import { Tooltip } from "@k8slens/tooltip";
import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
import { withInjectables } from "@ogre-tools/injectable-react";
import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";

View File

@ -8,7 +8,7 @@ import React, { useRef, useState } from "react";
import { Icon } from "../icon";
import { Badge } from "../badge";
import { HotbarSwitchCommand } from "./hotbar-switch-command";
import { Tooltip, TooltipPosition } from "../tooltip";
import { Tooltip, TooltipPosition } from "@k8slens/tooltip";
import { observer } from "mobx-react";
import { withInjectables } from "@ogre-tools/injectable-react";
import commandOverlayInjectable from "../command-palette/command-overlay.injectable";

View File

@ -10,7 +10,7 @@ import React, { createRef } from "react";
import { NavLink } from "react-router-dom";
import type { LocationDescriptor } from "history";
import { cssNames } from "@k8slens/utilities";
import { withTooltip } from "../tooltip";
import { withTooltip } from "@k8slens/tooltip";
import isNumber from "lodash/isNumber";
import Configuration from "./configuration.svg";
import Crane from "./crane.svg";

View File

@ -10,8 +10,8 @@ import React from "react";
import type { SingleOrMany } from "@k8slens/utilities";
import { debouncePromise, isPromiseSettledFulfilled, cssNames } from "@k8slens/utilities";
import { Icon } from "../icon";
import type { TooltipProps } from "../tooltip";
import { Tooltip } from "../tooltip";
import type { TooltipProps } from "@k8slens/tooltip";
import { Tooltip } from "@k8slens/tooltip";
import * as Validators from "./input_validators";
import type { InputValidator, InputValidation, InputValidationResult, SyncValidationMessage } from "./input_validators";
import uniqueId from "lodash/uniqueId";

View File

@ -18,7 +18,7 @@ import { KubeObjectMenu } from "../kube-object-menu";
import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter";
import { ResourceKindMap, ResourceNames } from "../../utils/rbac";
import { Icon } from "../icon";
import { TooltipPosition } from "../tooltip";
import { TooltipPosition } from "@k8slens/tooltip";
import { withInjectables } from "@ogre-tools/injectable-react";
import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
import type { SubscribableStore, SubscribeStores } from "../../kube-watch-api/kube-watch-api";

View File

@ -12,7 +12,7 @@ import { IpcRendererNavigationEvents } from "../../../common/ipc/navigation-even
import { Avatar } from "../avatar";
import { Icon } from "../icon";
import { Menu, MenuItem } from "../menu";
import { Tooltip } from "../tooltip";
import { Tooltip } from "@k8slens/tooltip";
import { withInjectables } from "@ogre-tools/injectable-react";
import { observer } from "mobx-react";
import type { VisitEntityContextMenu } from "../../../common/catalog/visit-entity-context-menu.injectable";

View File

@ -6,7 +6,7 @@
import "./line-progress.scss";
import React from "react";
import { cssNames } from "@k8slens/utilities";
import { withTooltip } from "../tooltip";
import { withTooltip } from "@k8slens/tooltip";
export interface LineProgressProps extends React.HTMLProps<HTMLDivElement> {
value: number;

View File

@ -14,7 +14,7 @@ import { Icon } from "../icon";
import type { MenuProps } from "./menu";
import { Menu, MenuItem } from "./menu";
import isString from "lodash/isString";
import type { TooltipDecoratorProps } from "../tooltip";
import type { TooltipDecoratorProps } from "@k8slens/tooltip";
import type { OpenConfirmDialog } from "../confirm-dialog/open.injectable";
import { withInjectables } from "@ogre-tools/injectable-react";
import openConfirmDialogInjectable from "../confirm-dialog/open.injectable";

View File

@ -7,7 +7,7 @@ import "./status-brick.scss";
import React from "react";
import { cssNames } from "@k8slens/utilities";
import { withTooltip } from "../tooltip";
import { withTooltip } from "@k8slens/tooltip";
export interface StatusBrickProps extends React.HTMLAttributes<HTMLDivElement> {
}

View File

@ -1,24 +0,0 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import React from "react";
export const withTooltip =
(Target: any) =>
({ tooltip, tooltipOverrideDisabled, ...props }: any) => {
if (tooltip) {
const testId = props["data-testid"];
return (
<>
<Target {...props} />
<div data-testid={testId && `tooltip-content-for-${testId}`}>
{tooltip.children || tooltip}
</div>
</>
);
}
return <Target {...props} />;
};

View File

@ -12,6 +12,7 @@ class ProtectFromImportingNonDependencies {
compiler.hooks.normalModuleFactory.tap("irrelevant", (normalModuleFactory) => {
normalModuleFactory.hooks.resolve.tap("irrelevant", (toBeResolved) => {
const isSassDependency = toBeResolved.request.endsWith(".scss");
const isLocalDependency = toBeResolved.request.startsWith(".");
const isDependencyOfDependency =
toBeResolved.context.includes("node_modules");
@ -19,7 +20,7 @@ class ProtectFromImportingNonDependencies {
const dependencyName = getDependencyName(toBeResolved.request);
const dependencyWeAreInterested =
!isLocalDependency && !isDependencyOfDependency && dependencyName;
!isSassDependency && !isLocalDependency && !isDependencyOfDependency && dependencyName;
if (dependencyWeAreInterested) {
nodeModulesToBeResolved.add(dependencyName);

View File

@ -1,4 +1,5 @@
import "@k8slens/core/styles";
import "@k8slens/tooltip/dist/index.css";
import { runInAction } from "mobx";
import {
rendererExtensionApi as Renderer,

View File

@ -0,0 +1,6 @@
{
"extends": "@k8slens/eslint-config/eslint",
"parserOptions": {
"project": "./tsconfig.json"
}
}

View File

@ -0,0 +1 @@
"@k8slens/eslint-config/prettier"

View File

@ -0,0 +1,19 @@
{
"module": {
"type": "commonjs"
},
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": true,
"decorators": true,
"dynamicImport": false
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
},
"target": "es2019"
}
}

View File

@ -0,0 +1,20 @@
# @k8slens/tooltip
This package contains stuff related to creating Lens-applications.
# Usage
```bash
$ npm install @k8slens/tooltip
```
```typescript
import { Tooltip, TooltipPosition } from "@k8slens/tooltip";
import { withTooltip } from "@k8slens/tooltip";
import type { TooltipProps } from "@k8slens/tooltip";
import type { TooltipDecoratorProps } from "@k8slens/tooltip";
```
## Extendability

View File

@ -0,0 +1,2 @@
export * from "./src/tooltip";
export * from "./src/withTooltip";

View File

@ -0,0 +1 @@
module.exports = require("@k8slens/jest").monorepoPackageConfig(__dirname).configForReact;

View File

@ -0,0 +1,50 @@
{
"name": "@k8slens/tooltip",
"private": false,
"version": "1.0.0-alpha.0",
"description": "Highly extendable tooltip in the Lens.",
"type": "commonjs",
"files": [
"dist"
],
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
},
"repository": {
"type": "git",
"url": "git+https://github.com/lensapp/lens.git"
},
"main": "dist/index.js",
"types": "dist/index.d.ts",
"author": {
"name": "OpenLens Authors",
"email": "info@k8slens.dev"
},
"license": "MIT",
"homepage": "https://github.com/lensapp/lens",
"scripts": {
"build": "webpack",
"test:unit": "jest --coverage --runInBand",
"lint": "lens-lint",
"lint:fix": "lens-lint --fix"
},
"peerDependencies": {
"@k8slens/feature-core": "^6.5.0-alpha.0",
"@k8slens/utilities": "^1.0.0-alpha.1",
"@ogre-tools/injectable": "^15.1.2",
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
"@ogre-tools/fp": "^15.1.2",
"auto-bind": "^4.0.0",
"lodash": "^4.17.21",
"mobx": "^6.8.0",
"mobx-react": "^7.6.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@async-fn/jest": "^1.6.4",
"@k8slens/eslint-config": "6.5.0-alpha.1",
"@k8slens/react-testing-library-discovery": "^1.0.0-alpha.0"
}
}

View File

@ -5,20 +5,14 @@
.Tooltip {
--bgc: var(--mainBackground);
--radius: #{$radius};
--color: var(--textColorAccent);
--border: 1px solid var(--borderColor);
// use positioning relative to viewport (window)
// https://developer.mozilla.org/en-US/docs/Web/CSS/position
position: fixed;
margin: 0 !important;
background: var(--bgc);
background: var(--mainBackground);
font-size: small;
font-weight: normal;
border-radius: var(--radius);
color: var(--color);
border-radius: 3px;
color: var(--textColorAccent);
white-space: normal;
padding: .5em;
text-align: center;
@ -55,7 +49,7 @@
}
&.small {
font-size: $font-size-small;
font-size: 12px;
}
&.warning {
@ -68,7 +62,6 @@
grid-template-columns: max-content 1fr;
grid-template-rows: repeat(2, 1fr);
// backward compatibility: skips element in DOM to consider only children in grid-flow
> .flex {
display: contents;
}
@ -79,7 +72,7 @@
}
.title {
grid-column: 1 / 3; // merge
grid-column: 1 / 3;
color: var(--textColorAccent);
text-align: center;
font-weight: bold;

View File

@ -15,7 +15,7 @@ describe("<Tooltip />", () => {
beforeEach(() => {
requestAnimationFrameSpy = jest.spyOn(window, "requestAnimationFrame");
requestAnimationFrameSpy.mockImplementation(cb => {
requestAnimationFrameSpy.mockImplementation((cb) => {
cb(0);
return 0;
@ -26,31 +26,28 @@ describe("<Tooltip />", () => {
requestAnimationFrameSpy.mockRestore();
});
it("does not render to DOM if not visibile", () => {
const result = render((
it("does not render to DOM if not visible", () => {
const result = render(
<>
<Tooltip targetId="my-target" usePortal={false}>I am a tooltip</Tooltip>
<Tooltip targetId="my-target" usePortal={false}>
I am a tooltip
</Tooltip>
<div id="my-target">Target Text</div>
</>
));
</>,
);
expect(result.baseElement).toMatchSnapshot();
});
it("renders to DOM when hovering over target", () => {
const result = render((
const result = render(
<>
<Tooltip
targetId="my-target"
data-testid="tooltip"
usePortal={false}
>
<Tooltip targetId="my-target" data-testid="tooltip" usePortal={false}>
I am a tooltip
</Tooltip>
<div id="my-target">Target Text</div>
</>
));
</>,
);
const target = result.baseElement.querySelector("#my-target");
@ -60,20 +57,15 @@ describe("<Tooltip />", () => {
expect(result.baseElement).toMatchSnapshot();
});
it("renders to DOM when forced to by visibile prop", () => {
const result = render((
it("renders to DOM when forced to by visible prop", () => {
const result = render(
<>
<Tooltip
targetId="my-target"
data-testid="tooltip"
visible={true}
usePortal={false}
>
<Tooltip targetId="my-target" data-testid="tooltip" visible={true} usePortal={false}>
I am a tooltip
</Tooltip>
<div id="my-target">Target Text</div>
</>
));
</>,
);
expect(result.baseElement).toMatchSnapshot();
});

View File

@ -55,8 +55,11 @@ export class Tooltip extends React.Component<TooltipProps> {
static defaultProps = defaultProps as object;
@observable.ref elem: HTMLDivElement | null = null;
@observable activePosition?: TooltipPosition;
@observable isVisible = false;
@observable isContentVisible = false; // animation manager
constructor(props: TooltipProps) {
@ -95,7 +98,7 @@ export class Tooltip extends React.Component<TooltipProps> {
@action
protected onEnterTarget() {
this.isVisible = true;
requestAnimationFrame(action(() => this.isContentVisible = true));
requestAnimationFrame(action(() => (this.isContentVisible = true)));
}
@action
@ -134,7 +137,8 @@ export class Tooltip extends React.Component<TooltipProps> {
// find proper position
for (const pos of positions) {
const { left, top, right, bottom } = this.getPosition(pos, selfBounds, targetBounds);
const fitsToWindow = left >= 0 && top >= 0 && right <= viewportWidth && bottom <= viewportHeight;
const fitsToWindow =
left >= 0 && top >= 0 && right <= viewportWidth && bottom <= viewportHeight;
if (fitsToWindow) {
this.activePosition = pos;
@ -224,12 +228,7 @@ export class Tooltip extends React.Component<TooltipProps> {
formatter: !!formatters,
});
const tooltip = (
<div
className={className}
style={style}
ref={elem => this.elem = elem}
role="tooltip"
>
<div className={className} style={style} ref={(elem) => (this.elem = elem)} role="tooltip">
{children}
</div>
);

View File

@ -33,10 +33,7 @@ export function withTooltip<TargetProps>(
// TODO: Remove side-effect to allow deterministic unit testing
const [defaultTooltipId] = useState(uniqueId("tooltip_target_"));
let {
id: targetId,
children: targetChildren,
} = props;
let { id: targetId, children: targetChildren } = props;
const {
tooltip,
tooltipOverrideDisabled,
@ -56,16 +53,14 @@ export function withTooltip<TargetProps>(
targetId = tooltipProps.targetId;
targetChildren = (
<>
<div>
{targetChildren}
</div>
<div>{targetChildren}</div>
<Tooltip {...tooltipProps} />
</>
);
}
return (
<Target id={targetId} {...targetProps as any}>
<Target id={targetId} {...(targetProps as any)}>
{targetChildren}
</Target>
);

View File

@ -0,0 +1,30 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
const path = require('path');
module.exports = {
content: [
path.join(__dirname, "src/**/*.tsx")
],
darkMode: "class",
theme: {
fontFamily: {
sans: ["Roboto", "Helvetica", "Arial", "sans-serif"],
},
extend: {
colors: {
textAccent: "var(--textColorAccent)",
textPrimary: "var(--textColorPrimary)",
textTertiary: "var(--textColorTertiary)",
textDimmed: "var(--textColorDimmed)",
},
},
},
variants: {
extend: {},
},
plugins: [],
};

View File

@ -0,0 +1,4 @@
{
"extends": "@k8slens/typescript/config/base.json",
"include": ["**/*.ts", "**/*.tsx"],
}

View File

@ -0,0 +1 @@
module.exports = require("@k8slens/webpack").configForReact;