Move move-link-click event details to API Also make the naming of the line number field consistent with the CreateCommentEventDetail. Change-Id: Ie4a114c2ce3ca16ea71cd0f6618d4d3a97e2e9c7
diff --git a/polygerrit-ui/app/api/diff.ts b/polygerrit-ui/app/api/diff.ts index 6e24f0f..0a6366d 100644 --- a/polygerrit-ui/app/api/diff.ts +++ b/polygerrit-ui/app/api/diff.ts
@@ -229,8 +229,8 @@ /** The detail of the 'create-comment' event dispatched by gr-diff. */ export declare interface CreateCommentEventDetail { - lineNum: LineNumber; side: Side; + lineNum: LineNumber; range: CommentRange | undefined; } @@ -240,3 +240,8 @@ right: LineRange; }; } + +export declare interface MovedLinkClickedEventDetail { + side: Side; + lineNum: LineNumber; +}
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts index 01a1a66..1d95057 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts
@@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {ContentLoadNeededEventDetail} from '../../../api/diff'; +import { + ContentLoadNeededEventDetail, + MovedLinkClickedEventDetail, +} from '../../../api/diff'; import {getBaseUrl} from '../../../utils/url-util'; import {GrDiffLine, GrDiffLineType, LineNumber} from '../gr-diff/gr-diff-line'; import { @@ -26,7 +29,6 @@ import {DiffInfo, DiffPreferencesInfo} from '../../../types/diff'; import {DiffViewMode, Side} from '../../../constants/constants'; import {DiffLayer} from '../../../types/types'; -import {MovedChunkGoToLineDetail} from '../../../types/events'; import {pluralize} from '../../../utils/string-util'; /** @@ -794,9 +796,9 @@ anchor.addEventListener('click', e => { e.preventDefault(); anchor.dispatchEvent( - new CustomEvent<MovedChunkGoToLineDetail>('moved-link-clicked', { + new CustomEvent<MovedLinkClickedEventDetail>('moved-link-clicked', { detail: { - line, + lineNum: line, side, }, composed: true,
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js index 062c801..4160d38 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js +++ b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js
@@ -421,7 +421,7 @@ const [startLineAnchor] = movedIn.querySelectorAll('a'); const onMovedLinkClicked = e => { - assert.deepEqual(e.detail, {line: 4, side: 'left'}); + assert.deepEqual(e.detail, {lineNum: 4, side: 'left'}); done(); }; assert.equal(startLineAnchor.textContent, '4'); @@ -436,7 +436,7 @@ const [, endLineAnchor] = movedOut.querySelectorAll('a'); const onMovedLinkClicked = e => { - assert.deepEqual(e.detail, {line: 4, side: 'right'}); + assert.deepEqual(e.detail, {lineNum: 4, side: 'right'}); done(); }; assert.equal(endLineAnchor.textContent, '4');
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.ts b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.ts index 36a59bd..b85d948 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.ts
@@ -61,7 +61,7 @@ import {PolymerDeepPropertyChange} from '@polymer/polymer/interfaces'; import {AbortStop} from '../../shared/gr-cursor-manager/gr-cursor-manager'; import {fireAlert, fireEvent} from '../../../utils/event-util'; -import {MovedChunkGoToLineEvent} from '../../../types/events'; +import {MovedLinkClickedEvent} from '../../../types/events'; // TODO(davido): See: https://github.com/GoogleChromeLabs/shadow-selection-polyfill/issues/9 // @ts-ignore import * as shadow from 'shadow-selection-polyfill/shadow.js'; @@ -554,8 +554,8 @@ ); } - _movedLinkClicked(e: MovedChunkGoToLineEvent) { - this._dispatchSelectedLine(e.detail.line, e.detail.side); + _movedLinkClicked(e: MovedLinkClickedEvent) { + this._dispatchSelectedLine(e.detail.lineNum, e.detail.side); } addDraftAtLine(el: Element) {
diff --git a/polygerrit-ui/app/types/events.ts b/polygerrit-ui/app/types/events.ts index baf156f..e9b2900 100644 --- a/polygerrit-ui/app/types/events.ts +++ b/polygerrit-ui/app/types/events.ts
@@ -17,9 +17,8 @@ import {EventApi} from '@polymer/polymer/lib/legacy/polymer.dom'; import {PatchSetNum, UrlEncodedCommentId} from './common'; import {UIComment} from '../utils/comment-util'; -import {Side} from '../constants/constants'; -import {LineNumber} from '../elements/diff/gr-diff/gr-diff-line'; import {FetchRequest} from './types'; +import {MovedLinkClickedEventDetail} from '../api/diff'; export interface TitleChangeEventDetail { title: string; @@ -164,16 +163,11 @@ export type ReloadEvent = CustomEvent<ReloadEventDetail>; -export interface MovedChunkGoToLineDetail { - side: Side; - line: LineNumber; -} - -export type MovedChunkGoToLineEvent = CustomEvent<MovedChunkGoToLineDetail>; +export type MovedLinkClickedEvent = CustomEvent<MovedLinkClickedEventDetail>; declare global { interface HTMLElementEventMap { - 'moved-link-clicked': MovedChunkGoToLineEvent; + 'moved-link-clicked': MovedLinkClickedEvent; } }