From ffd85cb71762cbe15da0f087842a087f86f5899b Mon Sep 17 00:00:00 2001 From: Federico Date: Mon, 8 Feb 2021 13:52:20 -0600 Subject: [PATCH] Ensure `update-pr-from-base-branch` is always clickable (#3956) --- source/features/update-pr-from-base-branch.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/features/update-pr-from-base-branch.tsx b/source/features/update-pr-from-base-branch.tsx index 66773ef024a..ef2ce18b56b 100644 --- a/source/features/update-pr-from-base-branch.tsx +++ b/source/features/update-pr-from-base-branch.tsx @@ -1,6 +1,7 @@ import React from 'dom-chef'; import select from 'select-dom'; import onetime from 'onetime'; +import delegate from 'delegate-it'; import {AlertIcon} from '@primer/octicons-react'; import * as pageDetect from 'github-url-detection'; import {observe, Observer} from 'selector-observer'; @@ -29,13 +30,13 @@ async function mergeBranches(): Promise { }); } -async function handler({currentTarget}: React.MouseEvent): Promise { +async function handler({delegateTarget}: delegate.Event): Promise { const {base, head} = getBranches(); if (!confirm(`Merge the ${base} branch into ${head}?`)) { return; } - const statusMeta = currentTarget.parentElement!; + const statusMeta = delegateTarget.parentElement!; statusMeta.textContent = 'Updating branch…'; observer.abort(); @@ -56,13 +57,14 @@ async function addButton(position: Element): Promise { if (status === 'diverged') { position.append(' ', ( - You can . + You can . )); } } const waitForText = onetime(() => { + delegate(document, '.rgh-update-pr-from-base-branch', 'click', handler); observer = observe(selectorForPushablePRNotice, { add(position) { position.classList.add('rgh-update-pr');