Skip to content

Commit c2d2eec

Browse files
authored
Style expanded rows differently (#282)
* style expanded rows differently * remove log
1 parent 3fd920a commit c2d2eec

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

ts/codediff/codediff.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,15 @@ const CodeDiffView = React.memo((props: CodeDiffViewProps) => {
203203
}
204204
if (num === existing.numRows) {
205205
// change the skip to an equal
206-
return [{...op, type: 'equal'}];
206+
return [{...op, type: 'equal expanded'}];
207207
}
208208

209209
const {before, after} = op;
210210
if (num > 0) {
211211
return [
212212
{...op, before: [before[0], before[1] - num], after: [after[0], after[1] - num]},
213213
{
214-
type: 'equal',
214+
type: 'equal expanded',
215215
before: [before[1] - num, before[1]],
216216
after: [after[1] - num, after[1]],
217217
},
@@ -220,7 +220,7 @@ const CodeDiffView = React.memo((props: CodeDiffViewProps) => {
220220
num = -num;
221221
return [
222222
{
223-
type: 'equal',
223+
type: 'equal expanded',
224224
before: [before[0], before[0] + num],
225225
after: [after[0], after[0] + num],
226226
},

ts/codediff/codes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export type OpCode = [
1010
export type LineRange = [start: number, limit: number];
1111

1212
export interface DiffRange {
13-
type: OpType | 'skip';
13+
type: OpType | 'skip' | 'equal expanded';
1414
before: LineRange;
1515
after: LineRange;
1616
header?: string;

webdiff/static/css/style.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ td.code {
4444
width: 101ch; /* per-side max line length */
4545
}
4646

47+
.code.equal.expanded {
48+
background-color: #f7f7f7;
49+
}
50+
4751
.file-selector {
4852
padding-bottom: 5px;
4953
border-bottom: 1px solid #ccc;

0 commit comments

Comments
 (0)