Skip to content

Commit

Permalink
Merge pull request #247 from sima-land/246-deps-upd
Browse files Browse the repository at this point in the history
#246 Обновить кварки и нуклоны
  • Loading branch information
krutoo authored Apr 17, 2024
2 parents 5dc27f5 + 1b530b5 commit 20645f3
Show file tree
Hide file tree
Showing 15 changed files with 147 additions and 629 deletions.
42 changes: 21 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
"webpack": "^5.64.4"
},
"peerDependencies": {
"@sima-land/ui-nucleons": "^45.0.0-alpha.13",
"@sima-land/ui-quarks": "^4.6.0",
"@sima-land/ui-nucleons": "^45.0.0-alpha.14",
"@sima-land/ui-quarks": "^5.0.0",
"react": "^17.0 || ^18.0"
}
}
2 changes: 1 addition & 1 deletion src/common/components/media-modal/parts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { defineSlots } from '@sima-land/ui-nucleons/helpers';
import { useBreakpoint } from '@sima-land/ui-nucleons/hooks';
import { useMounted } from '../../../../common/hooks';
import { ScrollSection } from './scroll-section';
import LeftSVG from '@sima-land/ui-quarks/icons/16x16/Stroked/Arrows/Left';
import LeftSVG from '@sima-land/ui-quarks/icons/16x16/Stroked/ArrowExpandLeft';
import styles from './parts.module.scss';

export const Preset = {
Expand Down
2 changes: 1 addition & 1 deletion src/common/components/media-modal/parts/thumbnail.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createContext, useContext, MouseEventHandler } from 'react';
import { ImageOverlay } from '../../../../desktop/components/gallery-modal/components/image-overlay';
import PlaySVG from '@sima-land/ui-quarks/icons/24x24/Filled/Play';
import AllRoundSVG from '@sima-land/ui-quarks/icons/40x40/Filled/Round360';
import AllRoundSVG from '@sima-land/ui-quarks/icons/40x40/Filled/Viewing360Perspective';
import { Price } from '@sima-land/ui-nucleons/price';
import { useImageStub } from '../../../hooks';
import classNames from 'classnames/bind';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState, useCallback, FormEventHandler, ChangeEventHandler, useMemo }
import type { PaginationControlsProps } from './types';
import { Input, InputProps } from '@sima-land/ui-nucleons/input';
import { Pagination, validatePaginationState } from '@sima-land/ui-nucleons/pagination';
import RightSVG from '@sima-land/ui-quarks/icons/16x16/Stroked/Arrows/Right';
import RightSVG from '@sima-land/ui-quarks/icons/16x16/Stroked/ArrowExpandRight';
import classNames from 'classnames/bind';
import styles from './pagination-controls.module.scss';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { ReactNode, useState } from 'react';
import { Badge, BadgeProps } from '@sima-land/moleculas/common/components/badge';
import { Stepper } from '@sima-land/ui-nucleons/stepper';
import FavoriteSVG from '@sima-land/ui-quarks/icons/24x24/Stroked/Favorite';
import QuickView2SVG from '@sima-land/ui-quarks/icons/24x24/Stroked/QuickView2';
import Camera2SVG from '@sima-land/ui-quarks/icons/24x24/Stroked/Camera2';
import QuickView2SVG from '@sima-land/ui-quarks/icons/24x24/Stroked/MagnifierPlus';
import Camera2SVG from '@sima-land/ui-quarks/icons/24x24/Stroked/Camera';

export default {
title: 'common/ProductInfo',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,13 @@ exports[`ProductInfo regular content positioned image icon-buttons 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
<svg
class="svg"
Expand All @@ -112,21 +104,13 @@ exports[`ProductInfo regular content positioned image icon-buttons 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
</div>
<div
Expand All @@ -143,21 +127,13 @@ exports[`ProductInfo regular content positioned image icon-buttons 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
<svg
class="svg"
Expand All @@ -166,21 +142,13 @@ exports[`ProductInfo regular content positioned image icon-buttons 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
</div>
</div>
Expand Down Expand Up @@ -245,21 +213,13 @@ exports[`ProductInfo regular content should match snapshot 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
<svg
class="svg"
Expand All @@ -268,21 +228,13 @@ exports[`ProductInfo regular content should match snapshot 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
</div>
<div
Expand All @@ -299,21 +251,13 @@ exports[`ProductInfo regular content should match snapshot 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
<svg
class="svg"
Expand All @@ -322,21 +266,13 @@ exports[`ProductInfo regular content should match snapshot 1`] = `
width="24"
>
<path
clip-rule="evenodd"
d="M3 11.5a8.5 8.5 0 1 1 17 0 8.5 8.5 0 0 1-17 0ZM11.5 5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13Z"
fill-rule="evenodd"
d="M10.5 9a1 1 0 1 1 2 0v1.5H14a1 1 0 1 1 0 2h-1.5V14a1 1 0 1 1-2 0v-1.5H9a1 1 0 1 1 0-2h1.5V9Z"
/>
<path
clip-rule="evenodd"
d="M16.293 16.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414Z"
d="M11.5 3a8.5 8.5 0 1 0 5.262 15.176l3.53 3.531a1 1 0 0 0 1.415-1.414l-3.531-3.531A8.5 8.5 0 0 0 11.5 3ZM5 11.5a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"
fill-rule="evenodd"
/>
<path
d="M10.5 9a1 1 0 1 1 2 0v5a1 1 0 1 1-2 0V9Z"
/>
<path
d="M9 12.5a1 1 0 1 1 0-2h5a1 1 0 1 1 0 2H9Z"
/>
</svg>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { render, fireEvent } from '@testing-library/react';
import { ProductInfo, Parts } from '../product-info';
import { Badge, BadgeProps } from '../../badge';
import QuickViewSVG from '@sima-land/ui-quarks/icons/24x24/Stroked/QuickView2';
import QuickViewSVG from '@sima-land/ui-quarks/icons/24x24/Stroked/MagnifierPlus';
import { Button } from '@sima-land/ui-nucleons/button';

const normalizePrice = (s: string): string => s.replace(/\s+/g, '').replace(',', '.');
Expand Down
Loading

0 comments on commit 20645f3

Please sign in to comment.