Skip to content

Commit 2b1cf65

Browse files
jcfrancobenelan
authored andcommitted
fix(inline-editable): fix cancel workflow (#11046)
1 parent 0202228 commit 2b1cf65

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/calcite-components/src/components/inline-editable/inline-editable.e2e.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ describe("calcite-inline-editable", () => {
225225
await cancelEvent;
226226
expect(await input.getProperty("value")).toBe("John Doe");
227227
expect(calciteInlineEditableEditCancel).toHaveReceivedEventTimes(1);
228+
expect(await element.getProperty("editingEnabled")).toBe(false);
228229
});
229230

230231
it("restores input value after escape key is pressed", async () => {

packages/calcite-components/src/components/inline-editable/inline-editable.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export class InlineEditable
234234
this.inputElement.value = this.valuePriorToEditing;
235235
}
236236
this.disableEditing();
237-
this.enableEditingButton.value.setFocus();
237+
this.enableEditingButton.value?.setFocus();
238238
if (!this.editingEnabled && !!this.shouldEmitCancel) {
239239
this.calciteInlineEditableEditCancel.emit();
240240
}
@@ -270,8 +270,7 @@ export class InlineEditable
270270
private async enableEditingHandler(event: MouseEvent) {
271271
if (
272272
this.disabled ||
273-
event.target === this.cancelEditingButton.value ||
274-
event.target === this.confirmEditingButton.value
273+
(event.target !== this.enableEditingButton.value && event.target !== this.inputElement)
275274
) {
276275
return;
277276
}

0 commit comments

Comments
 (0)