SONAR-22049 Align Note component

diff --git a/server/sonar-web/design-system/src/components/BubbleChart.tsx b/server/sonar-web/design-system/src/components/BubbleChart.tsx
index 5fa8237f4c98fe9e19cfb5a03056e0ca12e78757..61bdbd22b867d56739fd6a0660a65de93e33e739 100644 (file)
--- a/server/sonar-web/design-system/src/components/BubbleChart.tsx
+++ b/server/sonar-web/design-system/src/components/BubbleChart.tsx
@@ -30,8 +30,8 @@ import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer';
 import tw from 'twin.macro';
 import { themeColor, themeContrast } from '../helpers';
 import { ButtonSecondary } from '../sonar-aligned/components/buttons';
+import { Note } from '../sonar-aligned/components/typography';
 import { BubbleColorVal } from '../types/charts';
-import { Note } from './Text';
 import { Tooltip } from './Tooltip';
 
 const TICKS_COUNT = 5;

diff --git a/server/sonar-web/design-system/src/components/Text.tsx b/server/sonar-web/design-system/src/components/Text.tsx
index 4147c6cc45f69b185e04a8763c480208c33045ac..22821cd98ca2d976d0673804baf110fe5a9640d5 100644 (file)
--- a/server/sonar-web/design-system/src/components/Text.tsx
+++ b/server/sonar-web/design-system/src/components/Text.tsx
@@ -158,9 +158,3 @@ export const Highlight = styled.strong`
 
   ${tw`sw-body-sm-highlight`}
 `;
-
-export const Note = styled.span`
-  color: ${themeColor('pageContentLight')};
-
-  ${tw`sw-body-sm`}
-`;

diff --git a/server/sonar-web/design-system/src/components/TextAccordion.tsx b/server/sonar-web/design-system/src/components/TextAccordion.tsx
index cbb65f6d80337915aa899c0199d7e7bdb1195bdc..cb709b249fc69abab4f79c0f6f3dc90480673b0a 100644 (file)
--- a/server/sonar-web/design-system/src/components/TextAccordion.tsx
+++ b/server/sonar-web/design-system/src/components/TextAccordion.tsx
@@ -24,7 +24,7 @@ import React, { ReactNode } from 'react';
 import tw from 'twin.macro';
 import { themeColor } from '../helpers';
 import { BareButton } from '../sonar-aligned/components/buttons';
-import { Note } from './Text';
+import { Note } from '../sonar-aligned/components/typography';
 import { OpenCloseIndicator } from './icons';
 
 interface Props {

diff --git a/server/sonar-web/design-system/src/components/__tests__/Banner-test.tsx b/server/sonar-web/design-system/src/components/__tests__/Banner-test.tsx
index 8c9cfe3837a23558d112cedf138caf86f5938549..8a50ced11bc98eb90ab63a1f6852e1559ea3520b 100644 (file)
--- a/server/sonar-web/design-system/src/components/__tests__/Banner-test.tsx
+++ b/server/sonar-web/design-system/src/components/__tests__/Banner-test.tsx
@@ -19,9 +19,9 @@
  */
 import { screen } from '@testing-library/react';
 import { renderWithContext } from '../../helpers/testUtils';
+import { Note } from '../../sonar-aligned';
 import { FCProps } from '../../types/misc';
 import { Banner } from '../Banner';
-import { Note } from '../Text';
 
 it('should render with close button', async () => {
   const onDismiss = jest.fn();

diff --git a/server/sonar-web/design-system/src/components/input/FileInput.tsx b/server/sonar-web/design-system/src/components/input/FileInput.tsx
index 8ac68f29e77755220afe7ae4edc9734303f93f70..bda00ea4070e17145040635bd54ae2f6e656fd3b 100644 (file)
--- a/server/sonar-web/design-system/src/components/input/FileInput.tsx
+++ b/server/sonar-web/design-system/src/components/input/FileInput.tsx
@@ -20,7 +20,7 @@
 import classNames from 'classnames';
 import { useCallback, useRef, useState } from 'react';
 import { ButtonSecondary } from '../../sonar-aligned/components/buttons/ButtonSecondary';
-import { Note } from '../Text';
+import { Note } from '../../sonar-aligned/components/typography';
 
 interface Props {
   chooseLabel: string;

diff --git a/server/sonar-web/design-system/src/components/input/FormField.tsx b/server/sonar-web/design-system/src/components/input/FormField.tsx
index e7e4a502db63b781f4a892f8d449af585aa8e7a6..0a1c53699488c798a576c0629c14e85ad9742ec0 100644 (file)
--- a/server/sonar-web/design-system/src/components/input/FormField.tsx
+++ b/server/sonar-web/design-system/src/components/input/FormField.tsx
@@ -20,7 +20,8 @@
 import styled from '@emotion/styled';
 import { ReactNode } from 'react';
 import tw from 'twin.macro';
-import { Highlight, Note } from '../Text';
+import { Note } from '../../sonar-aligned';
+import { Highlight } from '../Text';
 import { RequiredIcon } from '../icons';
 
 interface Props {

diff --git a/server/sonar-web/design-system/src/sonar-aligned/components/index.ts b/server/sonar-web/design-system/src/sonar-aligned/components/index.ts
index 2dd07df0a9cfb44e7e656211e8486e531f6032ab..d9765390baafaa1445d3d1786044e27f8a88c471 100644 (file)
--- a/server/sonar-web/design-system/src/sonar-aligned/components/index.ts
+++ b/server/sonar-web/design-system/src/sonar-aligned/components/index.ts
@@ -21,3 +21,4 @@
 export * from './Card';
 export * from './MetricsRatingBadge';
 export * from './buttons';
+export * from './typography';

diff --git a/server/sonar-web/design-system/src/sonar-aligned/components/typography/Note.tsx b/server/sonar-web/design-system/src/sonar-aligned/components/typography/Note.tsx
new file mode 100644 (file)
index 0000000..8ae52b9
--- /dev/null
+++ b/server/sonar-web/design-system/src/sonar-aligned/components/typography/Note.tsx
@@ -0,0 +1,29 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import styled from '@emotion/styled';
+import tw from 'twin.macro';
+import { themeColor } from '../../../helpers';
+
+export const Note = styled.span`
+  color: ${themeColor('pageContentLight')};
+
+  ${tw`sw-body-sm`}
+`;

diff --git a/server/sonar-web/design-system/src/sonar-aligned/components/typography/index.ts b/server/sonar-web/design-system/src/sonar-aligned/components/typography/index.ts
new file mode 100644 (file)
index 0000000..abb2b30
--- /dev/null
+++ b/server/sonar-web/design-system/src/sonar-aligned/components/typography/index.ts
@@ -0,0 +1,21 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+export * from './Note';