@jetbrains/ring-ui 5.0.3 → 5.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,5 @@
1
1
  import angular from 'angular';
2
2
 
3
- import AngularElastic from '@jetbrains/angular-elastic';
4
-
5
3
  import MessageBundle from '../message-bundle-ng/message-bundle-ng';
6
4
  import '../input/input-legacy.css';
7
5
  import '../error-bubble/error-bubble-legacy.css';
@@ -10,7 +8,7 @@ import '../error-bubble/error-bubble-legacy.css';
10
8
  * @name Form Ng
11
9
  */
12
10
 
13
- const angularModule = angular.module('Ring.form', [MessageBundle, AngularElastic]);
11
+ const angularModule = angular.module('Ring.form', [MessageBundle]);
14
12
 
15
13
  angularModule.factory('getFormErrorMessages',
16
14
  function getFormErrorMessagesDirective(RingMessageBundle) {
@@ -5,5 +5,5 @@ declare module 'react-markdown/lib/complex-types' {
5
5
  language?: string;
6
6
  }
7
7
  }
8
- declare const MarkdownCode: ({ children, language, inline }: CodeProps) => JSX.Element;
8
+ declare const MarkdownCode: ({ children, language, inline, className }: CodeProps) => JSX.Element;
9
9
  export default MarkdownCode;
@@ -1,7 +1,14 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
3
  import Code from '../code/code';
4
- const MarkdownCode = ({ children, language, inline }) => (<Code language={language} code={children?.join('') || ''} inline={inline}/>);
4
+ const MarkdownCode = ({ children, language, inline, className }) => {
5
+ // Hack for updated react-markdown RG-2193
6
+ const lang = language ?? (className?.
7
+ split(' ').
8
+ find(name => name.startsWith('language-'))?.
9
+ replace('language-', ''));
10
+ return (<Code language={lang} className={className} code={children?.join('') || ''} inline={inline}/>);
11
+ };
5
12
  MarkdownCode.propTypes = {
6
13
  language: PropTypes.string,
7
14
  children: PropTypes.array.isRequired,
@@ -42,7 +42,9 @@ export interface CustomAnchorProps {
42
42
  wrapperProps: HTMLAttributes<HTMLElement> & DataTestProps & {
43
43
  ref: RefCallback<HTMLElement>;
44
44
  };
45
- buttonProps: ButtonHTMLAttributes<HTMLButtonElement> & DataTestProps;
45
+ buttonProps: Pick<ButtonHTMLAttributes<HTMLButtonElement>, 'id' | 'disabled' | 'children'> & {
46
+ onClick: () => void;
47
+ } & DataTestProps;
46
48
  popup: ReactNode;
47
49
  }
48
50
  export declare type CustomAnchor = ((props: CustomAnchorProps) => ReactNode);
@@ -1,12 +1,11 @@
1
1
  import angular from 'angular';
2
- import AngularElastic from '@jetbrains/angular-elastic';
3
2
  import MessageBundle from '../message-bundle-ng/message-bundle-ng.js';
4
3
 
5
4
  /**
6
5
  * @name Form Ng
7
6
  */
8
7
 
9
- const angularModule = angular.module('Ring.form', [MessageBundle, AngularElastic]);
8
+ const angularModule = angular.module('Ring.form', [MessageBundle]);
10
9
  angularModule.factory('getFormErrorMessages', ["RingMessageBundle", function getFormErrorMessagesDirective(RingMessageBundle) {
11
10
  function msg(id, formError) {
12
11
  const messageBundleId = "form_".concat(id);
@@ -5,5 +5,5 @@ declare module 'react-markdown/lib/complex-types' {
5
5
  language?: string;
6
6
  }
7
7
  }
8
- declare const MarkdownCode: ({ children, language, inline }: CodeProps) => JSX.Element;
8
+ declare const MarkdownCode: ({ children, language, inline, className }: CodeProps) => JSX.Element;
9
9
  export default MarkdownCode;
@@ -1,3 +1,4 @@
1
+ import 'core-js/modules/es.string.replace.js';
1
2
  import React from 'react';
2
3
  import PropTypes from 'prop-types';
3
4
  import Code from '../code/code.js';
@@ -10,13 +11,19 @@ import '../global/trivial-template-tag.js';
10
11
  import '../global/memoize.js';
11
12
 
12
13
  const MarkdownCode = _ref => {
14
+ var _className$split$find;
15
+
13
16
  let {
14
17
  children,
15
18
  language,
16
- inline
19
+ inline,
20
+ className
17
21
  } = _ref;
22
+ // Hack for updated react-markdown RG-2193
23
+ const lang = language !== null && language !== void 0 ? language : className === null || className === void 0 ? void 0 : (_className$split$find = className.split(' ').find(name => name.startsWith('language-'))) === null || _className$split$find === void 0 ? void 0 : _className$split$find.replace('language-', '');
18
24
  return /*#__PURE__*/React.createElement(Code, {
19
- language: language,
25
+ language: lang,
26
+ className: className,
20
27
  code: (children === null || children === void 0 ? void 0 : children.join('')) || '',
21
28
  inline: inline
22
29
  });
@@ -11,6 +11,7 @@ import trivialTemplateTag from '../global/trivial-template-tag.js';
11
11
  import MarkdownCode from './code.js';
12
12
  import MarkdownLink from './link.js';
13
13
  import MarkdownHeading from './heading.js';
14
+ import 'core-js/modules/es.string.replace.js';
14
15
  import '../code/code.js';
15
16
  import 'highlight.js/lib/core';
16
17
  import '../global/memoize.js';
@@ -15,7 +15,6 @@ import '../global/data-tests.js';
15
15
  import 'core-js/modules/web.dom-collections.iterator.js';
16
16
  import '../_helpers/loader-inline.js';
17
17
  import '../_helpers/button-set.js';
18
- import '@jetbrains/angular-elastic';
19
18
  import '../global/dom.js';
20
19
  import '../shortcuts/core.js';
21
20
  import 'combokeys';
@@ -42,7 +42,9 @@ export interface CustomAnchorProps {
42
42
  wrapperProps: HTMLAttributes<HTMLElement> & DataTestProps & {
43
43
  ref: RefCallback<HTMLElement>;
44
44
  };
45
- buttonProps: ButtonHTMLAttributes<HTMLButtonElement> & DataTestProps;
45
+ buttonProps: Pick<ButtonHTMLAttributes<HTMLButtonElement>, 'id' | 'disabled' | 'children'> & {
46
+ onClick: () => void;
47
+ } & DataTestProps;
46
48
  popup: ReactNode;
47
49
  }
48
50
  export declare type CustomAnchor = ((props: CustomAnchorProps) => ReactNode);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jetbrains/ring-ui",
3
- "version": "5.0.3",
3
+ "version": "5.0.6",
4
4
  "description": "JetBrains UI library",
5
5
  "author": "JetBrains",
6
6
  "license": "Apache-2.0",
@@ -72,7 +72,7 @@
72
72
  "@babel/eslint-parser": "^7.17.0",
73
73
  "@jetbrains/eslint-config": "^5.3.2",
74
74
  "@jetbrains/stylelint-config": "^3.0.2",
75
- "@primer/octicons": "^17.0.0",
75
+ "@primer/octicons": "^17.2.0",
76
76
  "@rollup/plugin-babel": "^5.3.1",
77
77
  "@rollup/plugin-node-resolve": "^13.0.6",
78
78
  "@rollup/plugin-replace": "^4.0.0",
@@ -87,10 +87,10 @@
87
87
  "@storybook/client-api": "6.5.4",
88
88
  "@storybook/core": "6.5.4",
89
89
  "@storybook/html": "6.5.4",
90
- "@storybook/manager-webpack5": "6.5.4",
90
+ "@storybook/manager-webpack5": "6.5.6",
91
91
  "@storybook/react": "6.5.4",
92
92
  "@storybook/source-loader": "6.5.4",
93
- "@storybook/theming": "6.5.4",
93
+ "@storybook/theming": "6.5.6",
94
94
  "@testing-library/react": "^13.0.0",
95
95
  "@testing-library/user-event": "^14.1.0",
96
96
  "@types/chai": "^4.2.21",
@@ -105,7 +105,7 @@
105
105
  "@typescript-eslint/eslint-plugin": "^5.3.1",
106
106
  "@typescript-eslint/parser": "^5.3.1",
107
107
  "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
108
- "angular": "^1.8.2",
108
+ "angular": "^1.8.3",
109
109
  "angular-mocks": "^1.8.2",
110
110
  "angular-route": "^1.8.3",
111
111
  "babel-plugin-react-docgen": "^4.2.1",
@@ -190,7 +190,6 @@
190
190
  "dependencies": {
191
191
  "@babel/core": "^7.17.8",
192
192
  "@babel/preset-typescript": "^7.14.5",
193
- "@jetbrains/angular-elastic": "^2.5.1",
194
193
  "@jetbrains/babel-preset-jetbrains": "^2.3.2",
195
194
  "@jetbrains/icons": "^3.19.1",
196
195
  "@jetbrains/logos": "^1.4.27",
@@ -227,7 +226,7 @@
227
226
  "interpolate-loader": "^2.0.1",
228
227
  "just-debounce-it": "^3.0.1",
229
228
  "memoize-one": "^6.0.0",
230
- "postcss": "^8.4.12",
229
+ "postcss": "^8.4.14",
231
230
  "postcss-calc": "^8.2.4",
232
231
  "postcss-flexbugs-fixes": "^5.0.2",
233
232
  "postcss-font-family-system-ui": "^5.0.0",
@@ -254,5 +253,5 @@
254
253
  "node": ">=7.4",
255
254
  "npm": ">=6.0.0"
256
255
  },
257
- "gitHead": "2d8c142365124d1c05fe5c12b327df3d36c5d050"
256
+ "gitHead": "4b577abfab1d2bdfb299324d52b9e65117c8aa43"
258
257
  }