Skip to content

Commit c91fa95

Browse files
committed
Don't select row when clicking a button or dropdown
1 parent 440e158 commit c91fa95

2 files changed

Lines changed: 26 additions & 4 deletions

File tree

extensions/ql-vscode/src/view/common/Dropdown.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ type Props = {
2525
"aria-label"?: string;
2626
};
2727

28+
const stopClickPropagation = (e: React.MouseEvent) => {
29+
e.stopPropagation();
30+
};
2831
/**
2932
* A dropdown implementation styled to look like `VSCodeDropdown`.
3033
*
@@ -50,6 +53,7 @@ export function Dropdown({
5053
value={disabled ? disabledValue : value}
5154
disabled={disabled}
5255
onChange={onChange}
56+
onClick={stopClickPropagation}
5357
className={className}
5458
{...props}
5559
>

extensions/ql-vscode/src/view/model-editor/MethodRow.tsx

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,23 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
204204
<MethodClassifications method={method} />
205205
<MethodName {...props.method} />
206206
{viewState.mode === Mode.Application && (
207-
<UsagesButton onClick={jumpToMethod}>
207+
<UsagesButton
208+
onClick={(event: React.MouseEvent) => {
209+
event.stopPropagation();
210+
jumpToMethod();
211+
}}
212+
>
208213
{method.usages.length}
209214
</UsagesButton>
210215
)}
211-
<ViewLink onClick={jumpToMethod}>View</ViewLink>
216+
<ViewLink
217+
onClick={(event: React.MouseEvent) => {
218+
event.stopPropagation();
219+
jumpToMethod();
220+
}}
221+
>
222+
View
223+
</ViewLink>
212224
{props.modelingInProgress && <ProgressRing />}
213225
</ApiOrMethodRow>
214226
</DataGridCell>
@@ -277,7 +289,10 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
277289
<CodiconRow
278290
appearance="icon"
279291
aria-label="Add new model"
280-
onClick={handleAddModelClick}
292+
onClick={(event: React.MouseEvent) => {
293+
event.stopPropagation();
294+
handleAddModelClick();
295+
}}
281296
disabled={addModelButtonDisabled}
282297
>
283298
<Codicon name="add" />
@@ -286,7 +301,10 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
286301
<CodiconRow
287302
appearance="icon"
288303
aria-label="Remove model"
289-
onClick={removeModelClickedHandlers[index]}
304+
onClick={(event: React.MouseEvent) => {
305+
event.stopPropagation();
306+
removeModelClickedHandlers[index]();
307+
}}
290308
>
291309
<Codicon name="trash" />
292310
</CodiconRow>

0 commit comments

Comments
 (0)