react-diff-viewer-continued 3.2.4 → 3.2.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.
@@ -23,6 +23,15 @@
23
23
  "contributions": [
24
24
  "code"
25
25
  ]
26
+ },
27
+ {
28
+ "login": "KimBiYam",
29
+ "name": "Chang Hyun Kim",
30
+ "avatar_url": "https://avatars.githubusercontent.com/u/59679962?v=4",
31
+ "profile": "http://kimbiyam.me",
32
+ "contributions": [
33
+ "code"
34
+ ]
26
35
  }
27
36
  ],
28
37
  "contributorsPerLine": 7,
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [3.2.6](https://github.com/aeolun/react-diff-viewer-continued/compare/v3.2.5...v3.2.6) (2023-03-02)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * release for chore fix ([9775afa](https://github.com/aeolun/react-diff-viewer-continued/commit/9775afac2388942d97c839954186eb5b4fd64c3c))
7
+
8
+ ## [3.2.5](https://github.com/aeolun/react-diff-viewer-continued/compare/v3.2.4...v3.2.5) (2023-01-23)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * correctly break strings for long values so size remains within bounds ([cfa5de1](https://github.com/aeolun/react-diff-viewer-continued/commit/cfa5de1905644c34152dc8a692191d1e32410353))
14
+
1
15
  ## [3.2.4](https://github.com/aeolun/react-diff-viewer-continued/compare/v3.2.3...v3.2.4) (2022-12-23)
2
16
 
3
17
 
package/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  <br/>
4
4
 
5
5
  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6
- [![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat)](#contributors)
6
+ [![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
7
7
  <!-- ALL-CONTRIBUTORS-BADGE:END -->
8
8
 
9
9
  [![npm version](https://img.shields.io/npm/v/react-diff-viewer-continued)](https://www.npmjs.com/package/react-diff-viewer-continued)
@@ -376,8 +376,9 @@ Check package.json for more build scripts.
376
376
  <table>
377
377
  <tbody>
378
378
  <tr>
379
- <td align="center"><a href="https://github.com/ericmorgan1"><img src="https://avatars.githubusercontent.com/u/10346191?v=4?s=100" width="100px;" alt="Eric M."/><br /><sub><b>Eric M.</b></sub></a><br /><a href="https://github.com/Aeolun/react-diff-viewer-continued/commits?author=ericmorgan1" title="Code">💻</a></td>
380
- <td align="center"><a href="https://github.com/spyroid"><img src="https://avatars.githubusercontent.com/u/844495?v=4?s=100" width="100px;" alt="Andrei Kovalevsky"/><br /><sub><b>Andrei Kovalevsky</b></sub></a><br /><a href="https://github.com/Aeolun/react-diff-viewer-continued/commits?author=spyroid" title="Code">💻</a></td>
379
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/ericmorgan1"><img src="https://avatars.githubusercontent.com/u/10346191?v=4?s=100" width="100px;" alt="Eric M."/><br /><sub><b>Eric M.</b></sub></a><br /><a href="https://github.com/Aeolun/react-diff-viewer-continued/commits?author=ericmorgan1" title="Code">💻</a></td>
380
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/spyroid"><img src="https://avatars.githubusercontent.com/u/844495?v=4?s=100" width="100px;" alt="Andrei Kovalevsky"/><br /><sub><b>Andrei Kovalevsky</b></sub></a><br /><a href="https://github.com/Aeolun/react-diff-viewer-continued/commits?author=spyroid" title="Code">💻</a></td>
381
+ <td align="center" valign="top" width="14.28%"><a href="http://kimbiyam.me"><img src="https://avatars.githubusercontent.com/u/59679962?v=4?s=100" width="100px;" alt="Chang Hyun Kim"/><br /><sub><b>Chang Hyun Kim</b></sub></a><br /><a href="https://github.com/Aeolun/react-diff-viewer-continued/commits?author=KimBiYam" title="Code">💻</a></td>
381
382
  </tr>
382
383
  </tbody>
383
384
  </table>
package/lib/styles.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Interpolation } from 'emotion';
1
+ import { CSSInterpolation } from '@emotion/css';
2
2
  export interface ReactDiffViewerStyles {
3
3
  diffContainer?: string;
4
4
  diffRemoved?: string;
@@ -55,27 +55,27 @@ export interface ReactDiffViewerStylesOverride {
55
55
  dark?: ReactDiffViewerStylesVariables;
56
56
  light?: ReactDiffViewerStylesVariables;
57
57
  };
58
- diffContainer?: Interpolation;
59
- diffRemoved?: Interpolation;
60
- diffAdded?: Interpolation;
61
- diffChanged?: Interpolation;
62
- marker?: Interpolation;
63
- emptyGutter?: Interpolation;
64
- highlightedLine?: Interpolation;
65
- lineNumber?: Interpolation;
66
- highlightedGutter?: Interpolation;
67
- contentText?: Interpolation;
68
- gutter?: Interpolation;
69
- line?: Interpolation;
70
- wordDiff?: Interpolation;
71
- wordAdded?: Interpolation;
72
- wordRemoved?: Interpolation;
73
- codeFoldGutter?: Interpolation;
74
- codeFold?: Interpolation;
75
- emptyLine?: Interpolation;
76
- content?: Interpolation;
77
- titleBlock?: Interpolation;
78
- splitView?: Interpolation;
58
+ diffContainer?: CSSInterpolation;
59
+ diffRemoved?: CSSInterpolation;
60
+ diffAdded?: CSSInterpolation;
61
+ diffChanged?: CSSInterpolation;
62
+ marker?: CSSInterpolation;
63
+ emptyGutter?: CSSInterpolation;
64
+ highlightedLine?: CSSInterpolation;
65
+ lineNumber?: CSSInterpolation;
66
+ highlightedGutter?: CSSInterpolation;
67
+ contentText?: CSSInterpolation;
68
+ gutter?: CSSInterpolation;
69
+ line?: CSSInterpolation;
70
+ wordDiff?: CSSInterpolation;
71
+ wordAdded?: CSSInterpolation;
72
+ wordRemoved?: CSSInterpolation;
73
+ codeFoldGutter?: CSSInterpolation;
74
+ codeFold?: CSSInterpolation;
75
+ emptyLine?: CSSInterpolation;
76
+ content?: CSSInterpolation;
77
+ titleBlock?: CSSInterpolation;
78
+ splitView?: CSSInterpolation;
79
79
  }
80
80
  declare const _default: (styleOverride: ReactDiffViewerStylesOverride, useDarkTheme?: boolean) => ReactDiffViewerStyles;
81
81
  export default _default;
package/lib/styles.js CHANGED
@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
11
11
  return t;
12
12
  };
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
- const emotion_1 = require("emotion");
14
+ const css_1 = require("@emotion/css");
15
15
  // eslint-disable-next-line import/no-anonymous-default-export
16
16
  exports.default = (styleOverride, useDarkTheme = false) => {
17
17
  const { variables: overrideVariables = {} } = styleOverride, styles = __rest(styleOverride, ["variables"]);
@@ -72,17 +72,17 @@ exports.default = (styleOverride, useDarkTheme = false) => {
72
72
  }, (overrideVariables.dark || {})),
73
73
  };
74
74
  const variables = useDarkTheme ? themeVariables.dark : themeVariables.light;
75
- const content = (0, emotion_1.css)({
75
+ const content = (0, css_1.css)({
76
76
  width: '100%',
77
77
  label: 'content',
78
78
  });
79
- const splitView = (0, emotion_1.css)({
79
+ const splitView = (0, css_1.css)({
80
80
  [`.${content}`]: {
81
81
  width: '50%',
82
82
  },
83
83
  label: 'split-view',
84
84
  });
85
- const diffContainer = (0, emotion_1.css)({
85
+ const diffContainer = (0, css_1.css)({
86
86
  width: '100%',
87
87
  background: variables.diffViewerBackground,
88
88
  pre: {
@@ -93,15 +93,15 @@ exports.default = (styleOverride, useDarkTheme = false) => {
93
93
  label: 'diff-container',
94
94
  borderCollapse: 'collapse',
95
95
  });
96
- const codeFoldContent = (0, emotion_1.css)({
96
+ const codeFoldContent = (0, css_1.css)({
97
97
  color: variables.codeFoldContentColor,
98
98
  label: 'code-fold-content',
99
99
  });
100
- const contentText = (0, emotion_1.css)({
100
+ const contentText = (0, css_1.css)({
101
101
  color: variables.diffViewerColor,
102
102
  label: 'content-text',
103
103
  });
104
- const titleBlock = (0, emotion_1.css)({
104
+ const titleBlock = (0, css_1.css)({
105
105
  background: variables.diffViewerTitleBackground,
106
106
  padding: 10,
107
107
  borderBottom: `1px solid ${variables.diffViewerTitleBorderColor}`,
@@ -113,11 +113,11 @@ exports.default = (styleOverride, useDarkTheme = false) => {
113
113
  color: variables.diffViewerTitleColor,
114
114
  },
115
115
  });
116
- const lineNumber = (0, emotion_1.css)({
116
+ const lineNumber = (0, css_1.css)({
117
117
  color: variables.gutterColor,
118
118
  label: 'line-number',
119
119
  });
120
- const diffRemoved = (0, emotion_1.css)({
120
+ const diffRemoved = (0, css_1.css)({
121
121
  background: variables.removedBackground,
122
122
  color: variables.removedColor,
123
123
  pre: {
@@ -128,7 +128,7 @@ exports.default = (styleOverride, useDarkTheme = false) => {
128
128
  },
129
129
  label: 'diff-removed',
130
130
  });
131
- const diffAdded = (0, emotion_1.css)({
131
+ const diffAdded = (0, css_1.css)({
132
132
  background: variables.addedBackground,
133
133
  color: variables.addedColor,
134
134
  pre: {
@@ -139,32 +139,33 @@ exports.default = (styleOverride, useDarkTheme = false) => {
139
139
  },
140
140
  label: 'diff-added',
141
141
  });
142
- const diffChanged = (0, emotion_1.css)({
142
+ const diffChanged = (0, css_1.css)({
143
143
  background: variables.changedBackground,
144
144
  [`.${lineNumber}`]: {
145
145
  color: variables.gutterColor,
146
146
  },
147
147
  label: 'diff-changed',
148
148
  });
149
- const wordDiff = (0, emotion_1.css)({
149
+ const wordDiff = (0, css_1.css)({
150
150
  padding: 2,
151
151
  display: 'inline-flex',
152
- borderRadius: 1,
152
+ borderRadius: 4,
153
+ wordBreak: 'break-all',
153
154
  label: 'word-diff',
154
155
  });
155
- const wordAdded = (0, emotion_1.css)({
156
+ const wordAdded = (0, css_1.css)({
156
157
  background: variables.wordAddedBackground,
157
158
  label: 'word-added',
158
159
  });
159
- const wordRemoved = (0, emotion_1.css)({
160
+ const wordRemoved = (0, css_1.css)({
160
161
  background: variables.wordRemovedBackground,
161
162
  label: 'word-removed',
162
163
  });
163
- const codeFoldGutter = (0, emotion_1.css)({
164
+ const codeFoldGutter = (0, css_1.css)({
164
165
  backgroundColor: variables.codeFoldGutterBackground,
165
166
  label: 'code-fold-gutter',
166
167
  });
167
- const codeFold = (0, emotion_1.css)({
168
+ const codeFold = (0, css_1.css)({
168
169
  backgroundColor: variables.codeFoldBackground,
169
170
  height: 40,
170
171
  fontSize: 14,
@@ -178,11 +179,11 @@ exports.default = (styleOverride, useDarkTheme = false) => {
178
179
  },
179
180
  },
180
181
  });
181
- const emptyLine = (0, emotion_1.css)({
182
+ const emptyLine = (0, css_1.css)({
182
183
  backgroundColor: variables.emptyLineBackground,
183
184
  label: 'empty-line',
184
185
  });
185
- const marker = (0, emotion_1.css)({
186
+ const marker = (0, css_1.css)({
186
187
  width: 25,
187
188
  paddingLeft: 10,
188
189
  paddingRight: 10,
@@ -199,17 +200,17 @@ exports.default = (styleOverride, useDarkTheme = false) => {
199
200
  },
200
201
  },
201
202
  });
202
- const highlightedLine = (0, emotion_1.css)({
203
+ const highlightedLine = (0, css_1.css)({
203
204
  background: variables.highlightBackground,
204
205
  label: 'highlighted-line',
205
206
  [`.${wordAdded}, .${wordRemoved}`]: {
206
207
  backgroundColor: 'initial',
207
208
  },
208
209
  });
209
- const highlightedGutter = (0, emotion_1.css)({
210
+ const highlightedGutter = (0, css_1.css)({
210
211
  label: 'highlighted-gutter',
211
212
  });
212
- const gutter = (0, emotion_1.css)({
213
+ const gutter = (0, css_1.css)({
213
214
  userSelect: 'none',
214
215
  minWidth: 50,
215
216
  padding: '0 10px',
@@ -240,14 +241,14 @@ exports.default = (styleOverride, useDarkTheme = false) => {
240
241
  },
241
242
  },
242
243
  });
243
- const emptyGutter = (0, emotion_1.css)({
244
+ const emptyGutter = (0, css_1.css)({
244
245
  '&:hover': {
245
246
  background: variables.gutterBackground,
246
247
  cursor: 'initial',
247
248
  },
248
249
  label: 'empty-gutter',
249
250
  });
250
- const line = (0, emotion_1.css)({
251
+ const line = (0, css_1.css)({
251
252
  verticalAlign: 'baseline',
252
253
  label: 'line',
253
254
  });
@@ -276,11 +277,11 @@ exports.default = (styleOverride, useDarkTheme = false) => {
276
277
  titleBlock,
277
278
  };
278
279
  const computerOverrideStyles = Object.keys(styles).reduce((acc, key) => (Object.assign(Object.assign({}, acc), {
279
- [key]: (0, emotion_1.css)(styles[key]),
280
+ [key]: (0, css_1.css)(styles[key]),
280
281
  })), {});
281
282
  return Object.keys(defaultStyles).reduce((acc, key) => (Object.assign(Object.assign({}, acc), {
282
283
  [key]: computerOverrideStyles[key]
283
- ? (0, emotion_1.cx)(defaultStyles[key], computerOverrideStyles[key])
284
+ ? (0, css_1.cx)(defaultStyles[key], computerOverrideStyles[key])
284
285
  : defaultStyles[key],
285
286
  })), {});
286
287
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-diff-viewer-continued",
3
- "version": "3.2.4",
3
+ "version": "3.2.6",
4
4
  "private": false,
5
5
  "description": "Continuation of a simple and beautiful text diff viewer component made with diff and React",
6
6
  "keywords": [
@@ -35,9 +35,9 @@
35
35
  "prettier": "prettier --write ."
36
36
  },
37
37
  "dependencies": {
38
+ "@emotion/css": "^11.10.5",
38
39
  "classnames": "^2.3.1",
39
40
  "diff": "^5.1.0",
40
- "emotion": "^10.0.27",
41
41
  "memoize-one": "^6.0.0",
42
42
  "prop-types": "^15.8.1"
43
43
  },