@skbkontur/markdown 1.4.1 → 1.5.1

package/index.d.ts

@@ -1,11 +1,7 @@
-import { MarkdownThemeConsumerType, MarkdownThemeProviderType } from './src/styles/types';
-declare const MarkdownThemeProvider: MarkdownThemeProviderType;
-declare const MarkdownThemeConsumer: MarkdownThemeConsumerType;
 export { Markdown, MarkdownProps } from './src/Markdown/Markdown';
 export { MarkdownCombination } from './src/Markdown/MarkdownHelpers/MarkdownCombination';
 export { markdownHelpItems, markdownHelpFiles, markdownHelpLists, markdownHelpOther, } from './src/Markdown/MarkdownHelpItems';
 export { MarkdownViewer } from './src/MarkdownViewer/MarkdownViewer';
-export { MarkdownTheme } from './src/styles/theme';
 export { MarkdownApi, RefItem, User, Token, HorizontalPaddings, ViewMode } from '././src/Markdown/types';
 export { ThemeMode, ColorScheme } from './src/styles/types';
-export { MarkdownThemeProvider, MarkdownThemeConsumer };
+export { MarkdownTheme, MarkdownThemeProvider, MarkdownThemeConsumer, MarkdownThemeContext } from './src/styles/theme';

package/index.js

@@ -1,9 +1,6 @@
-import { ThemeProvider, ThemeConsumer } from 'styled-components';
-var MarkdownThemeProvider = ThemeProvider;
-var MarkdownThemeConsumer = ThemeConsumer;
 export { Markdown } from './src/Markdown/Markdown';
 export { MarkdownCombination } from './src/Markdown/MarkdownHelpers/MarkdownCombination';
 export { markdownHelpItems, markdownHelpFiles, markdownHelpLists, markdownHelpOther, } from './src/Markdown/MarkdownHelpItems';
 export { MarkdownViewer } from './src/MarkdownViewer/MarkdownViewer';
 export { ViewMode } from '././src/Markdown/types';
-export { MarkdownThemeProvider, MarkdownThemeConsumer };
+export { MarkdownThemeProvider, MarkdownThemeConsumer, MarkdownThemeContext } from './src/styles/theme';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/markdown",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -10,6 +10,7 @@
   "license": "UNLICENSED",
   "author": "tsypilov",
   "dependencies": {
+    "@types/styled-components": "5.1.26",
     "@types/turndown": "^5.0.1",
     "@types/uuid": "^9.0.1",
     "react-dropzone": "^14.2.3",
@@ -19,7 +20,7 @@
     "rehype-sanitize": "5.0.1",
     "remark-breaks": "^3.0.3",
     "remark-gfm": "^3.0.1",
-    "styled-components": "6.1.1",
+    "styled-components": "5.3.11",
     "turndown": "^7.1.2",
     "turndown-plugin-gfm": "^1.0.2",
     "uuid": "^9.0.0"
@@ -28,10 +29,11 @@
     "push": "git push --follow-tag",
     "bump": "lerna version",
     "build": "yarn tsc",
+    "clean": "tsc --build -clean",
     "lint-staged": "lint-staged",
     "lint": "eslint --ext=ts,tsx src && yarn stylelint",
     "lint:fix": "eslint --ext=.ts,tsx src --fix",
-    "stylelint": "stylelint \"src/**/*.{tsx,ts}\"",
+    "stylelint": "stylelint \"src/**/*.styled.{tsx,ts}\"",
     "prepare": "husky install .husky",
     "storybook": "start-storybook -p 6007 -s public",
     "build-storybook": "build-storybook --quiet",
@@ -92,14 +94,14 @@
     "jest-environment-jsdom": "29.5.0",
     "jest-teamcity-reporter": "0.9.0",
     "lerna": "5.0.0",
-    "lint-staged": "^12.3.4",
-    "postcss": "8",
-    "postcss-styled-syntax": "0.5.0",
+    "lint-staged": "12.3.4",
     "prettier": "2.2.1",
     "react": "16.9.0",
     "react-dom": "16.9.0",
-    "stylelint": "15.11.0",
-    "stylelint-config-standard": "34.0.0",
+    "stylelint": "13.13.1",
+    "stylelint-config-standard": "22.0.0",
+    "stylelint-config-styled-components": "^0.1.1",
+    "stylelint-processor-styled-components": "^1.10.0",
     "typescript": "4.9.4"
   },
   "files": [

package/src/Markdown/Markdown.js

@@ -24,7 +24,6 @@ import { SidePage, ThemeContext } from '@skbkontur/react-ui';
 import { HideBodyVerticalScroll } from '@skbkontur/react-ui/internal/HideBodyVerticalScroll';
 import React, { useEffect, useLayoutEffect, useRef, useState, } from 'react';
 import Foco from 'react-foco/lib';
-import { ThemeConsumer, ThemeProvider } from 'styled-components';
 import { MENTION_WRAPPER_ID_POSTFIX } from './constants';
 import { useFileLogic } from './Files/Files.logic';
 import { DroppablePlaceholder, getMarkdownReactUiTheme, MarkdownEditorBlock, MarkdownPreview, MentionWrapper, Wrapper, } from './Markdown.styled';
@@ -38,7 +37,8 @@ import { ViewMode } from './types';
 import { Guid } from './utils/guid';
 import { RequestStatus } from './utils/requestStatus';
 import { MarkdownViewer } from '../MarkdownViewer';
-import { DEFAULT_MARKDOWN_THEME } from '../styles/theme';
+import { ThemeProvider } from '../styles/styled-components';
+import { DEFAULT_MARKDOWN_THEME, MarkdownThemeConsumer } from '../styles/theme';
 export var Markdown = function (props) {
     var _a;
     var panelHorizontalPadding = props.panelHorizontalPadding, hideMarkdownActions = props.hideMarkdownActions, onClick = props.onClick, onChange = props.onChange, onSelect = props.onSelect, markdownViewer = props.markdownViewer, renderFilesValidation = props.renderFilesValidation, fileApiUrl = props.fileApiUrl, profileUrl = props.profileUrl, api = props.api, hideHeadersSelect = props.hideHeadersSelect, textareaProps = __rest(props, ["panelHorizontalPadding", "hideMarkdownActions", "onClick", "onChange", "onSelect", "markdownViewer", "renderFilesValidation", "fileApiUrl", "profileUrl", "api", "hideHeadersSelect"]);
@@ -75,12 +75,12 @@ export var Markdown = function (props) {
     };
     var content = (React.createElement(Foco, { component: "div", onClickOutside: resetStates },
         React.createElement(Wrapper, __assign({}, getRootProps()),
-            !hideMarkdownActions && (React.createElement(MarkdownActions, { textAreaRef: textareaRef, viewMode: viewMode, loadingFile: requestStatus === RequestStatus.isFetching, fullscreen: fullscreen, hideHeadersSelect: hideHeadersSelect, selectionStart: selectionStart, selectionEnd: selectionEnd, horizontalPaddings: horizontalPaddings, hasFilesApi: !!(api === null || api === void 0 ? void 0 : api.fileDownloadApi) && !!(api === null || api === void 0 ? void 0 : api.fileUploadApi), onOpenFileDialog: open, onChangeViewMode: setViewMode, onClickFullscreen: handleClickFullscreen })),
+            !hideMarkdownActions && (React.createElement(MarkdownActions, { textAreaRef: textareaRef, width: props.width, viewMode: viewMode, loadingFile: requestStatus === RequestStatus.isFetching, fullscreen: fullscreen, hideHeadersSelect: hideHeadersSelect, selectionStart: selectionStart, selectionEnd: selectionEnd, horizontalPaddings: horizontalPaddings, hasFilesApi: !!(api === null || api === void 0 ? void 0 : api.fileDownloadApi) && !!(api === null || api === void 0 ? void 0 : api.fileUploadApi), onOpenFileDialog: open, onChangeViewMode: setViewMode, onClickFullscreen: handleClickFullscreen })),
             isEditMode && error && (api === null || api === void 0 ? void 0 : api.getUsersApi) && (renderFilesValidation === null || renderFilesValidation === void 0 ? void 0 : renderFilesValidation(horizontalPaddings, onResetError)),
             isEditMode && renderEditContainer(),
             isDragActive && isEditMode && React.createElement(DroppablePlaceholder, __assign({}, horizontalPaddings))),
         !isEditMode && (React.createElement(MarkdownPreview, __assign({}, horizontalPaddings), (markdownViewer === null || markdownViewer === void 0 ? void 0 : markdownViewer(props.value)) || (React.createElement(MarkdownViewer, { source: (_a = props.value) !== null && _a !== void 0 ? _a : '', downloadFileApi: api === null || api === void 0 ? void 0 : api.fileDownloadApi, fileApiUrl: fileApiUrl, profileUrl: profileUrl }))))));
-    return (React.createElement(ThemeConsumer, null, function (theme) {
+    return (React.createElement(MarkdownThemeConsumer, null, function (theme) {
         var defaultTheme = theme !== null && theme !== void 0 ? theme : DEFAULT_MARKDOWN_THEME;
         var reactUiTheme = getMarkdownReactUiTheme(defaultTheme, theme === null || theme === void 0 ? void 0 : theme.reactUiTheme, panelHorizontalPadding, fullscreenTextareaPadding);
         return (React.createElement(ThemeProvider, { theme: defaultTheme },