react-diff-viewer-continued
Advanced tools
Comparing version 3.2.5 to 3.2.6
@@ -0,1 +1,8 @@ | ||
## [3.2.6](https://github.com/aeolun/react-diff-viewer-continued/compare/v3.2.5...v3.2.6) (2023-03-02) | ||
### Bug Fixes | ||
* release for chore fix ([9775afa](https://github.com/aeolun/react-diff-viewer-continued/commit/9775afac2388942d97c839954186eb5b4fd64c3c)) | ||
## [3.2.5](https://github.com/aeolun/react-diff-viewer-continued/compare/v3.2.4...v3.2.5) (2023-01-23) | ||
@@ -2,0 +9,0 @@ |
@@ -1,2 +0,2 @@ | ||
import { Interpolation } from 'emotion'; | ||
import { CSSInterpolation } from '@emotion/css'; | ||
export interface ReactDiffViewerStyles { | ||
@@ -58,25 +58,25 @@ diffContainer?: string; | ||
}; | ||
diffContainer?: Interpolation; | ||
diffRemoved?: Interpolation; | ||
diffAdded?: Interpolation; | ||
diffChanged?: Interpolation; | ||
marker?: Interpolation; | ||
emptyGutter?: Interpolation; | ||
highlightedLine?: Interpolation; | ||
lineNumber?: Interpolation; | ||
highlightedGutter?: Interpolation; | ||
contentText?: Interpolation; | ||
gutter?: Interpolation; | ||
line?: Interpolation; | ||
wordDiff?: Interpolation; | ||
wordAdded?: Interpolation; | ||
wordRemoved?: Interpolation; | ||
codeFoldGutter?: Interpolation; | ||
codeFold?: Interpolation; | ||
emptyLine?: Interpolation; | ||
content?: Interpolation; | ||
titleBlock?: Interpolation; | ||
splitView?: Interpolation; | ||
diffContainer?: CSSInterpolation; | ||
diffRemoved?: CSSInterpolation; | ||
diffAdded?: CSSInterpolation; | ||
diffChanged?: CSSInterpolation; | ||
marker?: CSSInterpolation; | ||
emptyGutter?: CSSInterpolation; | ||
highlightedLine?: CSSInterpolation; | ||
lineNumber?: CSSInterpolation; | ||
highlightedGutter?: CSSInterpolation; | ||
contentText?: CSSInterpolation; | ||
gutter?: CSSInterpolation; | ||
line?: CSSInterpolation; | ||
wordDiff?: CSSInterpolation; | ||
wordAdded?: CSSInterpolation; | ||
wordRemoved?: CSSInterpolation; | ||
codeFoldGutter?: CSSInterpolation; | ||
codeFold?: CSSInterpolation; | ||
emptyLine?: CSSInterpolation; | ||
content?: CSSInterpolation; | ||
titleBlock?: CSSInterpolation; | ||
splitView?: CSSInterpolation; | ||
} | ||
declare const _default: (styleOverride: ReactDiffViewerStylesOverride, useDarkTheme?: boolean) => ReactDiffViewerStyles; | ||
export default _default; |
@@ -14,3 +14,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
const emotion_1 = require("emotion"); | ||
const css_1 = require("@emotion/css"); | ||
// eslint-disable-next-line import/no-anonymous-default-export | ||
@@ -76,7 +76,7 @@ exports.default = (styleOverride, useDarkTheme = false) => { | ||
const variables = useDarkTheme ? themeVariables.dark : themeVariables.light; | ||
const content = (0, emotion_1.css)({ | ||
const content = (0, css_1.css)({ | ||
width: '100%', | ||
label: 'content', | ||
}); | ||
const splitView = (0, emotion_1.css)({ | ||
const splitView = (0, css_1.css)({ | ||
[`.${content}`]: { | ||
@@ -87,3 +87,3 @@ width: '50%', | ||
}); | ||
const diffContainer = (0, emotion_1.css)({ | ||
const diffContainer = (0, css_1.css)({ | ||
width: '100%', | ||
@@ -99,11 +99,11 @@ background: variables.diffViewerBackground, | ||
}); | ||
const codeFoldContent = (0, emotion_1.css)({ | ||
const codeFoldContent = (0, css_1.css)({ | ||
color: variables.codeFoldContentColor, | ||
label: 'code-fold-content', | ||
}); | ||
const contentText = (0, emotion_1.css)({ | ||
const contentText = (0, css_1.css)({ | ||
color: variables.diffViewerColor, | ||
label: 'content-text', | ||
}); | ||
const titleBlock = (0, emotion_1.css)({ | ||
const titleBlock = (0, css_1.css)({ | ||
background: variables.diffViewerTitleBackground, | ||
@@ -120,7 +120,7 @@ padding: 10, | ||
}); | ||
const lineNumber = (0, emotion_1.css)({ | ||
const lineNumber = (0, css_1.css)({ | ||
color: variables.gutterColor, | ||
label: 'line-number', | ||
}); | ||
const diffRemoved = (0, emotion_1.css)({ | ||
const diffRemoved = (0, css_1.css)({ | ||
background: variables.removedBackground, | ||
@@ -136,3 +136,3 @@ color: variables.removedColor, | ||
}); | ||
const diffAdded = (0, emotion_1.css)({ | ||
const diffAdded = (0, css_1.css)({ | ||
background: variables.addedBackground, | ||
@@ -148,3 +148,3 @@ color: variables.addedColor, | ||
}); | ||
const diffChanged = (0, emotion_1.css)({ | ||
const diffChanged = (0, css_1.css)({ | ||
background: variables.changedBackground, | ||
@@ -156,3 +156,3 @@ [`.${lineNumber}`]: { | ||
}); | ||
const wordDiff = (0, emotion_1.css)({ | ||
const wordDiff = (0, css_1.css)({ | ||
padding: 2, | ||
@@ -164,15 +164,15 @@ display: 'inline-flex', | ||
}); | ||
const wordAdded = (0, emotion_1.css)({ | ||
const wordAdded = (0, css_1.css)({ | ||
background: variables.wordAddedBackground, | ||
label: 'word-added', | ||
}); | ||
const wordRemoved = (0, emotion_1.css)({ | ||
const wordRemoved = (0, css_1.css)({ | ||
background: variables.wordRemovedBackground, | ||
label: 'word-removed', | ||
}); | ||
const codeFoldGutter = (0, emotion_1.css)({ | ||
const codeFoldGutter = (0, css_1.css)({ | ||
backgroundColor: variables.codeFoldGutterBackground, | ||
label: 'code-fold-gutter', | ||
}); | ||
const codeFold = (0, emotion_1.css)({ | ||
const codeFold = (0, css_1.css)({ | ||
backgroundColor: variables.codeFoldBackground, | ||
@@ -191,7 +191,7 @@ height: 40, | ||
}); | ||
const emptyLine = (0, emotion_1.css)({ | ||
const emptyLine = (0, css_1.css)({ | ||
backgroundColor: variables.emptyLineBackground, | ||
label: 'empty-line', | ||
}); | ||
const marker = (0, emotion_1.css)({ | ||
const marker = (0, css_1.css)({ | ||
width: 25, | ||
@@ -213,3 +213,3 @@ paddingLeft: 10, | ||
}); | ||
const highlightedLine = (0, emotion_1.css)({ | ||
const highlightedLine = (0, css_1.css)({ | ||
background: variables.highlightBackground, | ||
@@ -221,6 +221,6 @@ label: 'highlighted-line', | ||
}); | ||
const highlightedGutter = (0, emotion_1.css)({ | ||
const highlightedGutter = (0, css_1.css)({ | ||
label: 'highlighted-gutter', | ||
}); | ||
const gutter = (0, emotion_1.css)({ | ||
const gutter = (0, css_1.css)({ | ||
userSelect: 'none', | ||
@@ -256,3 +256,3 @@ minWidth: 50, | ||
}); | ||
const emptyGutter = (0, emotion_1.css)({ | ||
const emptyGutter = (0, css_1.css)({ | ||
'&:hover': { | ||
@@ -264,3 +264,3 @@ background: variables.gutterBackground, | ||
}); | ||
const line = (0, emotion_1.css)({ | ||
const line = (0, css_1.css)({ | ||
verticalAlign: 'baseline', | ||
@@ -294,9 +294,9 @@ label: 'line', | ||
const computerOverrideStyles = Object.keys(styles).reduce((acc, key) => (Object.assign(Object.assign({}, acc), { | ||
[key]: (0, emotion_1.css)(styles[key]), | ||
[key]: (0, css_1.css)(styles[key]), | ||
})), {}); | ||
return Object.keys(defaultStyles).reduce((acc, key) => (Object.assign(Object.assign({}, acc), { | ||
[key]: computerOverrideStyles[key] | ||
? (0, emotion_1.cx)(defaultStyles[key], computerOverrideStyles[key]) | ||
? (0, css_1.cx)(defaultStyles[key], computerOverrideStyles[key]) | ||
: defaultStyles[key], | ||
})), {}); | ||
}; |
{ | ||
"name": "react-diff-viewer-continued", | ||
"version": "3.2.5", | ||
"version": "3.2.6", | ||
"private": false, | ||
@@ -38,5 +38,5 @@ "description": "Continuation of a simple and beautiful text diff viewer component made with diff and React", | ||
"dependencies": { | ||
"@emotion/css": "^11.10.5", | ||
"classnames": "^2.3.1", | ||
"diff": "^5.1.0", | ||
"emotion": "^10.0.27", | ||
"memoize-one": "^6.0.0", | ||
@@ -43,0 +43,0 @@ "prop-types": "^15.8.1" |
@@ -6,3 +6,3 @@ <img src='https://github.com/Aeolun/react-diff-viewer-continued/raw/master/logo_dark.png' width="100%" alt='React Diff Viewer' /> | ||
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> | ||
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat)](#contributors) | ||
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-) | ||
<!-- ALL-CONTRIBUTORS-BADGE:END --> | ||
@@ -380,4 +380,5 @@ | ||
<tr> | ||
<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> | ||
<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> | ||
<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> | ||
<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> | ||
<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> | ||
</tr> | ||
@@ -384,0 +385,0 @@ </tbody> |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
126447
401
+ Added@emotion/css@^11.10.5
+ Added@emotion/babel-plugin@11.12.0(transitive)
+ Added@emotion/cache@11.13.1(transitive)
+ Added@emotion/css@11.13.0(transitive)
+ Added@emotion/hash@0.9.2(transitive)
+ Added@emotion/memoize@0.9.0(transitive)
+ Added@emotion/serialize@1.3.1(transitive)
+ Added@emotion/sheet@1.4.0(transitive)
+ Added@emotion/unitless@0.10.0(transitive)
+ Added@emotion/utils@1.4.0(transitive)
+ Added@emotion/weak-memoize@0.4.0(transitive)
+ Addedbabel-plugin-macros@3.1.0(transitive)
+ Addedcosmiconfig@7.1.0(transitive)
+ Addedcsstype@3.1.3(transitive)
+ Addedescape-string-regexp@4.0.0(transitive)
+ Addedstylis@4.2.0(transitive)
- Removedemotion@^10.0.27
- Removed@emotion/cache@10.0.29(transitive)
- Removed@emotion/hash@0.8.0(transitive)
- Removed@emotion/memoize@0.7.4(transitive)
- Removed@emotion/serialize@0.11.16(transitive)
- Removed@emotion/sheet@0.9.4(transitive)
- Removed@emotion/stylis@0.8.5(transitive)
- Removed@emotion/unitless@0.7.5(transitive)
- Removed@emotion/utils@0.11.3(transitive)
- Removed@emotion/weak-memoize@0.2.5(transitive)
- Removedbabel-plugin-emotion@10.2.2(transitive)
- Removedbabel-plugin-macros@2.8.0(transitive)
- Removedbabel-plugin-syntax-jsx@6.18.0(transitive)
- Removedcosmiconfig@6.0.0(transitive)
- Removedcreate-emotion@10.0.27(transitive)
- Removedcsstype@2.6.21(transitive)
- Removedemotion@10.0.27(transitive)