feat(plasma-new-hope/web/b2c/docs): fixes after review

salute-developers · Oct 11, 2023 · e253f74 · e253f74
1 parent cb4a7da
commit e253f74
Show file tree

Hide file tree

Showing 12 changed files with 185 additions and 189 deletions.
diff --git a/packages/plasma-b2c/src/components/Popover/Popover.tsx b/packages/plasma-b2c/src/components/Popover/Popover.tsx
@@ -1,7 +1,5 @@
 import { popoverConfig, component, mergeConfig } from '@salutejs/plasma-new-hope/styled-components';
 
-export type { PopoverPlacement, PopoverTrigger } from '@salutejs/plasma-new-hope/types';
-
 const mergedConfig = mergeConfig(popoverConfig);
 const PopoverComponent = component(mergedConfig);
 

diff --git a/packages/plasma-b2c/src/components/Popover/index.ts b/packages/plasma-b2c/src/components/Popover/index.ts
@@ -1,2 +1,2 @@
 export { Popover } from './Popover';
-export type { PopoverPlacement, PopoverTrigger } from './Popover';
+export type { PopoverProps, PopoverPlacement, PopoverTrigger } from '@salutejs/plasma-new-hope/types';
diff --git a/packages/plasma-new-hope/src/components/Popover/Popover.tsx b/packages/plasma-new-hope/src/components/Popover/Popover.tsx
diff --git a/packages/plasma-new-hope/src/components/Popover/index.ts b/packages/plasma-new-hope/src/components/Popover/index.ts
@@ -1,2 +1,2 @@
 export { popoverRoot, popoverConfig } from './Popover';
-export type { PopoverPlacement, PopoverTrigger } from './type';
+export type { PopoverProps, PopoverPlacement, PopoverTrigger } from './type';
diff --git a/packages/plasma-new-hope/src/components/Popover/styles/index.ts b/packages/plasma-new-hope/src/components/Popover/styles/index.ts
@@ -1,17 +1,18 @@
 import { css } from '@linaria/core';
-import styled from 'styled-components';
+import { styled } from '@linaria/react';
 
 export const StyledRoot = css`
     position: relative;
     box-sizing: border-box;
     display: inline-flex;
 `;
 
+export const StyledArrow = styled.div``;
+
 export const StyledPopover = styled.div`
     position: absolute;
     z-index: 1;
 
-    /* stylelint-disable selector-max-id */
     &[data-popper-placement^='top'] > #popover-arrow {
         bottom: -0.25rem;
     }

diff --git a/packages/plasma-new-hope/src/components/Popover/utils/index.ts b/packages/plasma-new-hope/src/components/Popover/utils/index.ts
@@ -1,11 +1,11 @@
-import PopperJS from '@popperjs/core';
+import type { Placement } from '@popperjs/core';
 
 import type { PopoverPlacement } from '../type';
 
 export const ESCAPE_KEYCODE = 27;
 
 export const getPlacement = (placement: PopoverPlacement) => {
-    return `${placement}-start` as PopperJS.Placement;
+    return `${placement}-start` as Placement;
 };
 
 export const getAutoPlacements = (placements?: PopoverPlacement[]) => {

diff --git a/packages/plasma-new-hope/src/examples/plasma_b2c/components/Popover/Popover.ts b/packages/plasma-new-hope/src/examples/plasma_b2c/components/Popover/Popover.ts
@@ -1,7 +1,7 @@
 import { popoverConfig } from '../../../../components/Popover';
 import { component, mergeConfig } from '../../../../engines';
 
-export type { PopoverPlacement, PopoverTrigger } from '../../../../components/Popover';
+export type { PopoverProps, PopoverPlacement, PopoverTrigger } from '../../../../components/Popover';
 
 const mergedConfig = mergeConfig(popoverConfig);
 

diff --git a/packages/plasma-web/src/components/Modal/Modal.component-test.tsx b/packages/plasma-web/src/components/Modal/Modal.component-test.tsx
@@ -11,7 +11,7 @@ const NoAnimationStyle = createGlobalStyle`
 
 const text = `Если после применения правила Лопиталя неопределённость типа 0 / 0 осталась, мнимая единица традиционно
 развивает Наибольший Общий Делитель (НОД).`;
-const heading = 'Голосовая викторина Валдисом Пельшем';
+const heading = 'Голосовая викторина с Валдисом Пельшем';
 
 describe('plasma-web: Modal', () => {
     const ModalsProvider = getComponent('ModalsProvider');

diff --git a/packages/plasma-web/src/components/Popover/Popover.component-test.tsx b/packages/plasma-web/src/components/Popover/Popover.component-test.tsx
@@ -3,7 +3,7 @@ import { mount, CypressTestDecorator, getComponent } from '@salutejs/plasma-cy-u
 
 import type { PopoverTrigger } from './Popover';
 
-const text = 'Голосовая викторина Валдисом Пельшем';
+const text = 'Голосовая викторина с Валдисом Пельшем';
 
 describe('plasma-web: Popover', () => {
     const Popover = getComponent('Popover');

diff --git a/packages/plasma-web/src/components/Popover/Popover.tsx b/packages/plasma-web/src/components/Popover/Popover.tsx
@@ -1,7 +1,5 @@
 import { popoverConfig, component, mergeConfig } from '@salutejs/plasma-new-hope/styled-components';
 
-export type { PopoverPlacement, PopoverTrigger } from '@salutejs/plasma-new-hope/types';
-
 const mergedConfig = mergeConfig(popoverConfig);
 const PopoverComponent = component(mergedConfig);
 

diff --git a/packages/plasma-web/src/components/Popover/index.ts b/packages/plasma-web/src/components/Popover/index.ts
@@ -1,2 +1,2 @@
 export { Popover } from './Popover';
-export type { PopoverPlacement, PopoverTrigger } from './Popover';
+export type { PopoverProps, PopoverPlacement, PopoverTrigger } from '@salutejs/plasma-new-hope/types';
diff --git a/website/plasma-web-docs/docs/components/Popover.mdx b/website/plasma-web-docs/docs/components/Popover.mdx
@@ -12,6 +12,8 @@ import { PropsTable, Description, StorybookLink } from '@site/src/components';
 
 ```tsx live
 import React from 'react';
+import styled from "styled-components";
+import { surfaceSolid03 } from "@salutejs/plasma-tokens-web";
 import { Popover, Button } from '@salutejs/plasma-web';
 
 export function App() {
@@ -36,7 +38,7 @@ export function App() {
     `;
 
     const StyledContent = styled.div`
-        background: var(--plasma-colors-surface-solid03);
+        background: ${surfaceSolid03};
         padding: 1rem;
 
         display: flex;