From 1355c9b331c51a29dad1cd73ec8cb2d7a24af27d Mon Sep 17 00:00:00 2001
From: "zhoulibin@xiaoxin" <125377187@qq.com>
Date: Fri, 5 Jul 2024 16:44:34 +0800
Subject: [PATCH] lint

---
 addon/prefs.js              |    2 +-
 src/component/PopupRoot.tsx | 1277 +++++++++++++++++------------------
 2 files changed, 637 insertions(+), 642 deletions(-)

diff --git a/addon/prefs.js b/addon/prefs.js
index 78f2fd4c..c7e24012 100644
--- a/addon/prefs.js
+++ b/addon/prefs.js
@@ -17,4 +17,4 @@ pref("__prefsPrefix__.split-nested-tags-keep-first", true);
 pref("__prefsPrefix__.split-nested-tags-keep-second", true);
 
 pref("__prefsPrefix__.show-query-href", false);
-pref("__prefsPrefix__.google-scholar-mirroring", ""); 
+pref("__prefsPrefix__.google-scholar-mirroring", "");
diff --git a/src/component/PopupRoot.tsx b/src/component/PopupRoot.tsx
index ae8a8b7b..b88290c9 100644
--- a/src/component/PopupRoot.tsx
+++ b/src/component/PopupRoot.tsx
@@ -538,7 +538,7 @@ export function PopupRoot({
   const [configName, setConfigName] = useState(getPref("configName"));
   function selectConfig(config: Config) {
     setShowConfig(false);
-    setPref("show-config", false)
+    setPref("show-config", false);
     setConfigName(config.configName);
     setPref("configName", config.configName);
     setBgColor(config.bgColor);
@@ -600,713 +600,712 @@ export function PopupRoot({
 
     // setTimeout(() => setShowConfig(true));
   }
-  const handleContentDiv = React.useCallback(() => (
-    <div
-      ref={popMaxWidthRef}
-      style={{
-        maxWidth: divMaxWidth + "px",
-        maxHeight: divMaxHeight + "px",
-        overflowY: "scroll",
-        background: "#f00",
-      }}
-    >
+  const handleContentDiv = React.useCallback(
+    () => (
       <div
+        ref={popMaxWidthRef}
         style={{
-          // marginTop: pFixedContentLocation || params.ids ? pFixedContentLocationTop + "px" : "unset",
-          backgroundColor: bgColor,
-          opacity: 1,
-          whiteSpace: "break-spaces",
-          display: "flex",
-          flexWrap: "wrap",
-          // maxWidth: Math.max(600, maxWidth) + "px",
-          // width: "600px",
-
-          // width: divMaxWidth + "px",
-          // minHeight: divMaxHeight + "px",
-          // overflowY: "scroll",
+          maxWidth: divMaxWidth + "px",
+          maxHeight: divMaxHeight + "px",
+          overflowY: "scroll",
+          background: "#f00",
         }}
-        // onClick={() => setIsPopoverOpen(!isPopoverOpen)}
-        onClick={() => setAutoCloseSeconds(-1)}
       >
-        {isShowConfig && (
-          <div
-            style={{
-              margin: "5px",
-              fontSize: "18px",
-              lineHeight: "1.5",
-              background: "#ddd",
-              width: "100%",
-            }}
-          >
-            <div style={{ display: "flex", flexWrap: "wrap" }}>
-              {ConfigTabArray.map((a) => (
-                <span
-                  style={{
-                    margin: "0px",
-                    padding: "0 5px",
-                    borderRadius: "8px 8px 3px 3px",
-                    borderBottom: "1px solid black",
-                    borderLeft: a !== configTab ? "1px solid black" : "",
-                    borderRight: a !== configTab ? "1px solid black" : "",
-                    borderTop: a == configTab ? "1px solid black" : "",
-                    background: a == configTab ? "#faa" : "",
-                  }}
-                  onClick={() => {
-                    setPref("configTab", a);
-                    setConfigTab(a);
-                  }}
-                >
-                  {a}
-                </span>
-              ))}
-            </div>
+        <div
+          style={{
+            // marginTop: pFixedContentLocation || params.ids ? pFixedContentLocationTop + "px" : "unset",
+            backgroundColor: bgColor,
+            opacity: 1,
+            whiteSpace: "break-spaces",
+            display: "flex",
+            flexWrap: "wrap",
+            // maxWidth: Math.max(600, maxWidth) + "px",
+            // width: "600px",
 
-            {"面板配置" == configTab && (
-              <>
-                <span style={configItemStyle}>
-                  <ChangeColor
-                    color={bgColor}
-                    onChange={(e) => {
-                      setBgColor(e);
-                      setPref("bgColor", e);
+            // width: divMaxWidth + "px",
+            // minHeight: divMaxHeight + "px",
+            // overflowY: "scroll",
+          }}
+          // onClick={() => setIsPopoverOpen(!isPopoverOpen)}
+          onClick={() => setAutoCloseSeconds(-1)}
+        >
+          {isShowConfig && (
+            <div
+              style={{
+                margin: "5px",
+                fontSize: "18px",
+                lineHeight: "1.5",
+                background: "#ddd",
+                width: "100%",
+              }}
+            >
+              <div style={{ display: "flex", flexWrap: "wrap" }}>
+                {ConfigTabArray.map((a) => (
+                  <span
+                    style={{
+                      margin: "0px",
+                      padding: "0 5px",
+                      borderRadius: "8px 8px 3px 3px",
+                      borderBottom: "1px solid black",
+                      borderLeft: a !== configTab ? "1px solid black" : "",
+                      borderRight: a !== configTab ? "1px solid black" : "",
+                      borderTop: a == configTab ? "1px solid black" : "",
+                      background: a == configTab ? "#faa" : "",
+                    }}
+                    onClick={() => {
+                      setPref("configTab", a);
+                      setConfigTab(a);
                     }}
                   >
-                    <span>调整背景颜色: </span>
-                    <span
-                      style={{
-                        background: bgColor,
-                        minWidth: "30px",
-                        display: "inline-block",
+                    {a}
+                  </span>
+                ))}
+              </div>
+
+              {"面板配置" == configTab && (
+                <>
+                  <span style={configItemStyle}>
+                    <ChangeColor
+                      color={bgColor}
+                      onChange={(e) => {
+                        setBgColor(e);
+                        setPref("bgColor", e);
                       }}
                     >
-                    </span>
-                  </ChangeColor>
-                </span>
-                <label style={configItemStyle}>
-                  <input
-                    type="checkbox"
-                    defaultChecked={pSingleWindow}
-                    onChange={(e) => {
-                      setPSingleWindow(e.currentTarget.checked);
-                      setPref("pSingleWindow", e.currentTarget.checked);
-                    }}
-                  />
-                  使用独立弹出弹窗 {!pSingleWindow && "（建议宽度小于300）"}
-                  {pSingleWindow}
-                </label>
-
+                      <span>调整背景颜色: </span>
+                      <span
+                        style={{
+                          background: bgColor,
+                          minWidth: "30px",
+                          display: "inline-block",
+                        }}
+                      ></span>
+                    </ChangeColor>
+                  </span>
+                  <label style={configItemStyle}>
+                    <input
+                      type="checkbox"
+                      defaultChecked={pSingleWindow}
+                      onChange={(e) => {
+                        setPSingleWindow(e.currentTarget.checked);
+                        setPref("pSingleWindow", e.currentTarget.checked);
+                      }}
+                    />
+                    使用独立弹出弹窗 {!pSingleWindow && "（建议宽度小于300）"}
+                    {pSingleWindow}
+                  </label>
 
-                <span style={configItemStyle}>
-                  面板最大宽度:
-                  <input
-                    type="number"
-                    min={100}
-                    max={1200}
-                    step={10}
-                    defaultValue={divMaxWidth}
-                    style={inputWidth("zlb")}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("divMaxWidth", e.currentTarget.valueAsNumber);
-                        setDivMaxWidth(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                  px。
                   <span style={configItemStyle}>
-                    面板最大高度:
+                    面板最大宽度:
                     <input
                       type="number"
-                      min={30}
-                      max={600}
+                      min={100}
+                      max={1200}
                       step={10}
-                      defaultValue={divMaxHeight}
+                      defaultValue={divMaxWidth}
                       style={inputWidth("zlb")}
                       onInput={(e) => {
                         if (e.currentTarget.value) {
-                          setPref("divMaxHeight", e.currentTarget.valueAsNumber);
-                          setDivMaxHeight(e.currentTarget.valueAsNumber);
+                          setPref("divMaxWidth", e.currentTarget.valueAsNumber);
+                          setDivMaxWidth(e.currentTarget.valueAsNumber);
                         }
                       }}
                     />
                     px。
+                    <span style={configItemStyle}>
+                      面板最大高度:
+                      <input
+                        type="number"
+                        min={30}
+                        max={600}
+                        step={10}
+                        defaultValue={divMaxHeight}
+                        style={inputWidth("zlb")}
+                        onInput={(e) => {
+                          if (e.currentTarget.value) {
+                            setPref("divMaxHeight", e.currentTarget.valueAsNumber);
+                            setDivMaxHeight(e.currentTarget.valueAsNumber);
+                          }
+                        }}
+                      />
+                      px。
+                    </span>
                   </span>
-                </span>
-                <span style={configItemStyle}>
-                  <input
-                    style={inputWidth("zlb")}
-                    type="number"
-                    min={5}
-                    max={100}
-                    defaultValue={getPrefAs("autoCloseSeconds", 15)}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setAutoCloseSeconds(e.currentTarget.valueAsNumber);
-                        setPref("autoCloseSeconds", e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                  秒后自动关闭。
-                </span>
-                {/* <span>当前配置：{configName}</span> */}
+                  <span style={configItemStyle}>
+                    <input
+                      style={inputWidth("zlb")}
+                      type="number"
+                      min={5}
+                      max={100}
+                      defaultValue={getPrefAs("autoCloseSeconds", 15)}
+                      onInput={(e) => {
+                        if (e.currentTarget.value) {
+                          setAutoCloseSeconds(e.currentTarget.valueAsNumber);
+                          setPref("autoCloseSeconds", e.currentTarget.valueAsNumber);
+                        }
+                      }}
+                    />
+                    秒后自动关闭。
+                  </span>
+                  {/* <span>当前配置：{configName}</span> */}
 
-                <span style={configItemStyle}>
-                  {ConfigTypeArray.map((a) => loadDefault(a)).map(
-                    (config) =>
-                      config && (
-                        <span
-                          style={{
-                            ...tagStyle,
-                            background: config.bgColor,
-                            fontWeight: configName == config.configName ? "bold" : "",
-                            border: configName == config.configName ? "1px solid #000" : "",
-                          }}
-                          onClick={() => {
-                            selectConfig(config);
-                          }}
-                        >
-                          {config.configName}
+                  <span style={configItemStyle}>
+                    {ConfigTypeArray.map((a) => loadDefault(a)).map(
+                      (config) =>
+                        config && (
+                          <span
+                            style={{
+                              ...tagStyle,
+                              background: config.bgColor,
+                              fontWeight: configName == config.configName ? "bold" : "",
+                              border: configName == config.configName ? "1px solid #000" : "",
+                            }}
+                            onClick={() => {
+                              selectConfig(config);
+                            }}
+                          >
+                            {config.configName}
+                          </span>
+                        ),
+                    )}{" "}
+                  </span>
+                </>
+              )}
+              {"固定位置" == configTab && (
+                <div>
+                  <label>
+                    <input
+                      type="checkbox"
+                      defaultChecked={pFixedContentLocation}
+                      onChange={(e) => {
+                        setPFixedContentLocation(e.currentTarget.checked);
+                        setPref("pFixedContentLocation", e.currentTarget.checked);
+                      }}
+                    />
+                    固定弹出区域
+                  </label>
+
+                  <span style={configItemStyle}>
+                    left:
+                    <input
+                      type="number"
+                      min={0}
+                      step={10}
+                      max={500}
+                      style={inputWidth("zlb")}
+                      defaultValue={pFixedContentLocationLeft}
+                      onInput={(e) => {
+                        if (e.currentTarget.value) {
+                          setPref("pFixedContentLocationLeft", e.currentTarget.value);
+                          setPFixedContentLocationLeft(e.currentTarget.valueAsNumber);
+                        }
+                      }}
+                    />
+                  </span>
+                  <span style={configItemStyle}>
+                    top:
+                    <input
+                      type="number"
+                      min={0}
+                      step={10}
+                      max={1000}
+                      style={inputWidth("zzlb")}
+                      defaultValue={pFixedContentLocationTop}
+                      onInput={(e) => {
+                        if (e.currentTarget.value) {
+                          setPFixedContentLocationTop(e.currentTarget.valueAsNumber);
+                        }
+                      }}
+                    />
+                  </span>
+                </div>
+              )}
+              {"弹出框" == configTab && (
+                <div
+                  style={{
+                    fontSize: "18px",
+                    lineHeight: "1.5",
+                  }}
+                >
+                  <>
+                    <label style={configItemStyle}>
+                      <input
+                        type="checkbox"
+                        defaultChecked={!pFixedContentLocation}
+                        onChange={(e) => {
+                          setPFixedContentLocation(!e.currentTarget.checked);
+                          setPref("pFixedContentLocation", !e.currentTarget.checked);
+                        }}
+                      />
+                      浮动弹出区域。
+                    </label>
+                    <span style={configItemStyle}>
+                      和颜色框的距离:
+                      <input
+                        type="number"
+                        min={0}
+                        step={1}
+                        max={200}
+                        style={inputWidth("zlb")}
+                        defaultValue={Math.round(pPadding)}
+                        onInput={(e) => {
+                          if (e.currentTarget.value) {
+                            setPref("pPadding", e.currentTarget.value);
+                            setPPadding(e.currentTarget.valueAsNumber);
+                          }
+                        }}
+                      />
+                    </span>
+                    <span style={configItemStyle}>
+                      边缘检测距离:
+                      <input
+                        type="number"
+                        min={40}
+                        step={1}
+                        max={200}
+                        style={inputWidth("zlb")}
+                        defaultValue={pBoundaryInset}
+                        onInput={(e) => {
+                          if (e.currentTarget.value) {
+                            setPref("pBoundaryInset", e.currentTarget.value);
+                            setPBoundaryInset(e.currentTarget.valueAsNumber);
+                          }
+                        }}
+                      />
+                    </span>
+                    <span style={configItemStyle}>
+                      三角大小:
+                      <input
+                        type="number"
+                        min={0}
+                        step={1}
+                        max={200}
+                        style={inputWidth("zlb")}
+                        defaultValue={pArrowSize}
+                        onInput={(e) => {
+                          if (e.currentTarget.value) {
+                            setPref("pArrowSize", e.currentTarget.value);
+                            setPArrowSize(e.currentTarget.valueAsNumber);
+                          }
+                        }}
+                      />{" "}
+                    </span>
+                    <span style={configItemStyle}>
+                      优先默认位置:
+                      {("bottom,left,top,right".split(",") as PopoverPosition[]).sort(sortFixed(pPositions)).map((a, i) => (
+                        <span key={a} style={configItemStyle}>
+                          [
+                          {i > 0 && i < pPositions.length && (
+                            <span
+                              onClick={() => {
+                                updatePPositions((pPositions) => {
+                                  pPositions.splice(i - 1, 0, ...pPositions.splice(i, 1));
+                                  setPref("pPositions", pPositions.join(","));
+                                });
+                              }}
+                            >
+                              ⬅️
+                            </span>
+                          )}
+                          <label style={{ margin: "0 2px" }}>
+                            <input
+                              type="checkbox"
+                              defaultChecked={pPositions.includes(a)}
+                              onChange={(_e) => {
+                                updatePPositions((pPositions) => {
+                                  const index = pPositions.findIndex((f) => f == a);
+                                  if (index > -1) pPositions.splice(i, 1);
+                                  else pPositions.push(a);
+                                  setPref("pPositions", pPositions.join(","));
+                                });
+                              }}
+                            />
+                            {a}
+                          </label>
+                          {i < pPositions.length - 1 && (
+                            <span
+                              onClick={() => {
+                                updatePPositions((pPositions) => {
+                                  pPositions.splice(i + 1, 0, ...pPositions.splice(i, 1));
+                                  setPref("pPositions", pPositions.join(","));
+                                });
+                              }}
+                            >
+                              ➡️
+                            </span>
+                          )}
+                          ]
                         </span>
-                      ),
-                  )}{" "}
-                </span>
-              </>
-            )}
-            {"固定位置" == configTab && (
-              <div>
-                <label>
-                  <input
-                    type="checkbox"
-                    defaultChecked={pFixedContentLocation}
-                    onChange={(e) => {
-                      setPFixedContentLocation(e.currentTarget.checked);
-                      setPref("pFixedContentLocation", e.currentTarget.checked);
-                    }}
-                  />
-                  固定弹出区域
-                </label>
+                      ))}
+                    </span>
+                  </>
+                </div>
+              )}
 
-                <span style={configItemStyle}>
-                  left:
-                  <input
-                    type="number"
-                    min={0}
-                    step={10}
-                    max={500}
-                    style={inputWidth("zlb")}
-                    defaultValue={pFixedContentLocationLeft}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("pFixedContentLocationLeft", e.currentTarget.value);
-                        setPFixedContentLocationLeft(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                </span>
-                <span style={configItemStyle}>
-                  top:
-                  <input
-                    type="number"
-                    min={0}
-                    step={10}
-                    max={1000}
-                    style={inputWidth("zzlb")}
-                    defaultValue={pFixedContentLocationTop}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPFixedContentLocationTop(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                </span>
-              </div>
-            )}
-            {"弹出框" == configTab && (
-              <div
-                style={{
-                  fontSize: "18px",
-                  lineHeight: "1.5",
-                }}
-              >
-                <>
+              {"颜色栏" == configTab && (
+                <span>
                   <label style={configItemStyle}>
                     <input
                       type="checkbox"
-                      defaultChecked={!pFixedContentLocation}
-                      onChange={(e) => {
-                        setPFixedContentLocation(!e.currentTarget.checked);
-                        setPref("pFixedContentLocation", !e.currentTarget.checked);
+                      defaultChecked={isShowSelectedPopupColorsTag}
+                      onInput={(e) => {
+                        setPref("show-selected-popup-colors-tag", e.currentTarget.checked);
+                        setShowSelectedPopupColorsTag(e.currentTarget.checked);
                       }}
                     />
-                    浮动弹出区域。
+                    {getString("pref-show-selected-popup-colors-tag", {
+                      branch: "label",
+                    })}
                   </label>
+                  <label style={configItemStyle}>
+                    <input
+                      type="checkbox"
+                      defaultChecked={isShowSelectedPopupMatchTag}
+                      onInput={(e) => {
+                        setPref("show-selected-popup-match-tag", e.currentTarget.checked);
+                        setShowSelectedPopupMatchTag(e.currentTarget.checked);
+                      }}
+                    />
+                    {getString("pref-show-selected-popup-match-tag", {
+                      branch: "label",
+                    })}
+                  </label>
+                  <br />
+                </span>
+              )}
+              {"标签样式" == configTab && (
+                <>
                   <span style={configItemStyle}>
-                    和颜色框的距离:
+                    显示
                     <input
                       type="number"
+                      defaultValue={showTagsLength}
                       min={0}
-                      step={1}
-                      max={200}
-                      style={inputWidth("zlb")}
-                      defaultValue={Math.round(pPadding)}
+                      max={100}
+                      style={inputWidth("lb")}
+                      onInput={(e) => {
+                        setPref("showTagsLength", e.currentTarget.value);
+                        setShowTagsLength(e.currentTarget.valueAsNumber);
+                      }}
+                    />
+                    个。
+                  </span>
+                  <span style={configItemStyle}>
+                    字体大小:
+                    <input
+                      type="number"
+                      min={6}
+                      max={72}
+                      step={0.5}
+                      defaultValue={fontSize}
+                      style={inputWidth("lb")}
                       onInput={(e) => {
                         if (e.currentTarget.value) {
-                          setPref("pPadding", e.currentTarget.value);
-                          setPPadding(e.currentTarget.valueAsNumber);
+                          setPref("fontSize", e.currentTarget.valueAsNumber);
+                          setFontSize(e.currentTarget.valueAsNumber);
                         }
                       }}
                     />
+                    px。
+                  </span>
+                  <span style={configItemStyle}>
+                    行高:
+                    <input
+                      type="number"
+                      defaultValue={lineHeight}
+                      min={0.1}
+                      max={3}
+                      step={0.1}
+                      style={inputWidth("lb")}
+                      onInput={(e) => {
+                        setPref("lineHeight", e.currentTarget.value);
+                        setLineHeight(e.currentTarget.value);
+                      }}
+                    />{" "}
                   </span>
                   <span style={configItemStyle}>
-                    边缘检测距离:
+                    margin:
                     <input
                       type="number"
-                      min={40}
-                      step={1}
+                      min={-10}
                       max={200}
-                      style={inputWidth("zlb")}
-                      defaultValue={pBoundaryInset}
+                      step={0.5}
+                      defaultValue={buttonMarginTopBottom}
+                      style={inputWidth("lb")}
                       onInput={(e) => {
                         if (e.currentTarget.value) {
-                          setPref("pBoundaryInset", e.currentTarget.value);
-                          setPBoundaryInset(e.currentTarget.valueAsNumber);
+                          setPref("buttonMarginTopBottom", e.currentTarget.valueAsNumber);
+                          setButtonMarginTopBottom(e.currentTarget.valueAsNumber);
                         }
                       }}
                     />
+                    <input
+                      type="number"
+                      min={-10}
+                      max={200}
+                      step={0.5}
+                      defaultValue={buttonMarginLeftRight}
+                      style={inputWidth("lb")}
+                      onInput={(e) => {
+                        if (e.currentTarget.value) {
+                          setPref("buttonMarginLeftRight", e.currentTarget.valueAsNumber);
+                          setButtonMarginLeftRight(e.currentTarget.valueAsNumber);
+                        }
+                      }}
+                    />{" "}
                   </span>
                   <span style={configItemStyle}>
-                    三角大小:
+                    padding:
                     <input
                       type="number"
-                      min={0}
-                      step={1}
+                      min={-10}
                       max={200}
-                      style={inputWidth("zlb")}
-                      defaultValue={pArrowSize}
+                      step={0.5}
+                      defaultValue={buttonPaddingTopBottom}
+                      style={inputWidth("lb")}
                       onInput={(e) => {
                         if (e.currentTarget.value) {
-                          setPref("pArrowSize", e.currentTarget.value);
-                          setPArrowSize(e.currentTarget.valueAsNumber);
+                          setPref("buttonPaddingTopBottom", e.currentTarget.valueAsNumber);
+                          setButtonPaddingTopBottom(e.currentTarget.valueAsNumber);
+                        }
+                      }}
+                    />
+                    <input
+                      type="number"
+                      min={-10}
+                      max={200}
+                      step={0.5}
+                      defaultValue={buttonPaddingLeftRight}
+                      style={inputWidth("lb")}
+                      onInput={(e) => {
+                        if (e.currentTarget.value) {
+                          setPref("buttonPaddingLeftRight", e.currentTarget.valueAsNumber);
+                          setButtonPaddingLeftRight(e.currentTarget.valueAsNumber);
                         }
                       }}
                     />{" "}
                   </span>
                   <span style={configItemStyle}>
-                    优先默认位置:
-                    {("bottom,left,top,right".split(",") as PopoverPosition[]).sort(sortFixed(pPositions)).map((a, i) => (
-                      <span key={a} style={configItemStyle}>
-                        [
-                        {i > 0 && i < pPositions.length && (
-                          <span
-                            onClick={() => {
-                              updatePPositions((pPositions) => {
-                                pPositions.splice(i - 1, 0, ...pPositions.splice(i, 1));
-                                setPref("pPositions", pPositions.join(","));
-                              });
-                            }}
-                          >
-                            ⬅️
-                          </span>
-                        )}
-                        <label style={{ margin: "0 2px" }}>
-                          <input
-                            type="checkbox"
-                            defaultChecked={pPositions.includes(a)}
-                            onChange={(_e) => {
-                              updatePPositions((pPositions) => {
-                                const index = pPositions.findIndex((f) => f == a);
-                                if (index > -1) pPositions.splice(i, 1);
-                                else pPositions.push(a);
-                                setPref("pPositions", pPositions.join(","));
-                              });
-                            }}
-                          />
-                          {a}
-                        </label>
-                        {i < pPositions.length - 1 && (
-                          <span
-                            onClick={() => {
-                              updatePPositions((pPositions) => {
-                                pPositions.splice(i + 1, 0, ...pPositions.splice(i, 1));
-                                setPref("pPositions", pPositions.join(","));
-                              });
-                            }}
-                          >
-                            ➡️
-                          </span>
-                        )}
-                        ]
-                      </span>
-                    ))}
+                    圆角:
+                    <input
+                      type="number"
+                      min={0}
+                      max={30}
+                      step={0.5}
+                      defaultValue={buttonBorderRadius}
+                      style={inputWidth("lb")}
+                      onInput={handleInputNumber("buttonBorderRadius", setButtonBorderRadius)}
+                    />
                   </span>
                 </>
-              </div>
-            )}
-
-            {"颜色栏" == configTab && (
-              <span>
-                <label style={configItemStyle}>
-                  <input
-                    type="checkbox"
-                    defaultChecked={isShowSelectedPopupColorsTag}
-                    onInput={(e) => {
-                      setPref("show-selected-popup-colors-tag", e.currentTarget.checked);
-                      setShowSelectedPopupColorsTag(e.currentTarget.checked);
-                    }}
-                  />
-                  {getString("pref-show-selected-popup-colors-tag", {
-                    branch: "label",
-                  })}
-                </label>
-                <label style={configItemStyle}>
-                  <input
-                    type="checkbox"
-                    defaultChecked={isShowSelectedPopupMatchTag}
-                    onInput={(e) => {
-                      setPref("show-selected-popup-match-tag", e.currentTarget.checked);
-                      setShowSelectedPopupMatchTag(e.currentTarget.checked);
-                    }}
-                  />
-                  {getString("pref-show-selected-popup-match-tag", {
-                    branch: "label",
-                  })}
-                </label>
-                <br />
-              </span>
-            )}
-            {"标签样式" == configTab && (
-              <>
-                <span style={configItemStyle}>
-                  显示
-                  <input
-                    type="number"
-                    defaultValue={showTagsLength}
-                    min={0}
-                    max={100}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      setPref("showTagsLength", e.currentTarget.value);
-                      setShowTagsLength(e.currentTarget.valueAsNumber);
-                    }}
-                  />
-                  个。
-                </span>
-                <span style={configItemStyle}>
-                  字体大小:
-                  <input
-                    type="number"
-                    min={6}
-                    max={72}
-                    step={0.5}
-                    defaultValue={fontSize}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("fontSize", e.currentTarget.valueAsNumber);
-                        setFontSize(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                  px。
-                </span>
-                <span style={configItemStyle}>
-                  行高:
-                  <input
-                    type="number"
-                    defaultValue={lineHeight}
-                    min={0.1}
-                    max={3}
-                    step={0.1}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      setPref("lineHeight", e.currentTarget.value);
-                      setLineHeight(e.currentTarget.value);
-                    }}
-                  />{" "}
-                </span>
-                <span style={configItemStyle}>
-                  margin:
-                  <input
-                    type="number"
-                    min={-10}
-                    max={200}
-                    step={0.5}
-                    defaultValue={buttonMarginTopBottom}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("buttonMarginTopBottom", e.currentTarget.valueAsNumber);
-                        setButtonMarginTopBottom(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                  <input
-                    type="number"
-                    min={-10}
-                    max={200}
-                    step={0.5}
-                    defaultValue={buttonMarginLeftRight}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("buttonMarginLeftRight", e.currentTarget.valueAsNumber);
-                        setButtonMarginLeftRight(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />{" "}
-                </span>
-                <span style={configItemStyle}>
-                  padding:
-                  <input
-                    type="number"
-                    min={-10}
-                    max={200}
-                    step={0.5}
-                    defaultValue={buttonPaddingTopBottom}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("buttonPaddingTopBottom", e.currentTarget.valueAsNumber);
-                        setButtonPaddingTopBottom(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />
-                  <input
-                    type="number"
-                    min={-10}
-                    max={200}
-                    step={0.5}
-                    defaultValue={buttonPaddingLeftRight}
-                    style={inputWidth("lb")}
-                    onInput={(e) => {
-                      if (e.currentTarget.value) {
-                        setPref("buttonPaddingLeftRight", e.currentTarget.valueAsNumber);
-                        setButtonPaddingLeftRight(e.currentTarget.valueAsNumber);
-                      }
-                    }}
-                  />{" "}
-                </span>
-                <span style={configItemStyle}>
-                  圆角:
-                  <input
-                    type="number"
-                    min={0}
-                    max={30}
-                    step={0.5}
-                    defaultValue={buttonBorderRadius}
-                    style={inputWidth("lb")}
-                    onInput={handleInputNumber("buttonBorderRadius", setButtonBorderRadius)}
-                  />
-                </span>
-              </>
-            )}
-            {"标签设置" == configTab && (
-              <>
-                <div>
-                  排序规则：
-                  {SortTypeArray.map((a) => (
+              )}
+              {"标签设置" == configTab && (
+                <>
+                  <div>
+                    排序规则：
+                    {SortTypeArray.map((a) => (
+                      <label>
+                        <input type="radio" value={a} checked={sortType === a} onChange={handleInput("sortType", setSortType)} />
+                        {a}
+                      </label>
+                    ))}
+                  </div>
+                </>
+              )}
+              {"待开发" == configTab && (
+                <>
+                  <div>
+                    相关标签的范围：（未完成）
                     <label>
-                      <input type="radio" value={a} checked={sortType === a} onChange={handleInput("sortType", setSortType)} />
-                      {a}
+                      <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfItem", false)} />
+                      本条目
                     </label>
-                  ))}
-                </div>
-              </>
-            )}
-            {"待开发" == configTab && (
-              <>
-                <div>
-                  相关标签的范围：（未完成）
-                  <label>
-                    <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfItem", false)} />
-                    本条目
-                  </label>
-                  <label>
-                    <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfCollection", false)} />
-                    本条目所在文件夹[]
-                  </label>
-                  <label>
-                    <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfCollection", false)} />
-                    本条目所在文件夹以及子文件夹[]
-                  </label>
-                  <label>
-                    <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfCollection", false)} />
-                    我的文库所有文件
-                  </label>
-                </div>
-                <div>Nest标签相关：（未完成）</div>
-                <div>Tag排除规则：（未完成）</div>
-              </>
-            )}
-          </div>
-        )}
-        <div
-          style={{
-            fontSize: "18px",
-            lineHeight: "1.5",
-            // background: "#fff",
-            boxShadow: params.ids ? "rgb(0, 0, 0) 0 0 3px 0px inset" : "",
-            borderTop: "1px solid #000",
-          }}
-        >
-          <span
+                    <label>
+                      <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfCollection", false)} />
+                      本条目所在文件夹[]
+                    </label>
+                    <label>
+                      <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfCollection", false)} />
+                      本条目所在文件夹以及子文件夹[]
+                    </label>
+                    <label>
+                      <input type="checkbox" value="0" defaultChecked={getPrefAs("TagRangeSelfCollection", false)} />
+                      我的文库所有文件
+                    </label>
+                  </div>
+                  <div>Nest标签相关：（未完成）</div>
+                  <div>Tag排除规则：（未完成）</div>
+                </>
+              )}
+            </div>
+          )}
+          <div
             style={{
-              display: "flex",
-              flexWrap: "wrap",
-              alignItems: "center",
+              fontSize: "18px",
+              lineHeight: "1.5",
+              // background: "#fff",
+              boxShadow: params.ids ? "rgb(0, 0, 0) 0 0 3px 0px inset" : "",
+              borderTop: "1px solid #000",
             }}
           >
             <span
               style={{
-                ...tagStyle,
-                background: isShowConfig ? "#00990030" : "#99000030",
-              }}
-              onClick={() => {
-                setPref("show-config", !isShowConfig);
-                setShowConfig(!isShowConfig);
+                display: "flex",
+                flexWrap: "wrap",
+                alignItems: "center",
               }}
             >
-              设置
-            </span>
-            {existTags.length > 0 && (
               <span
                 style={{
-                  display: "flex",
-                  flexWrap: "wrap",
-                  fontSize: fontSize + "px",
-                  lineHeight: lineHeight,
-                  alignItems: "center",
+                  ...tagStyle,
+                  background: isShowConfig ? "#00990030" : "#99000030",
+                }}
+                onClick={() => {
+                  setPref("show-config", !isShowConfig);
+                  setShowConfig(!isShowConfig);
                 }}
               >
-                现有标签：
-                {groupBy(existTags, (a) => a)
-                  .sort(sortValuesLength)
-                  .map((a) => (
-                    <span
-                      key={a.key}
-                      style={{
-                        ...tagStyle,
-                        whiteSpace: "nowrap",
-                        wordWrap: "normal",
-                        backgroundColor: memFixedColor(a.key, ""),
-                        boxShadow: "#ccc 0px 0px 4px 3px",
-                      }}
-                      onClick={() => {
-                        updateDelTags((dt) => {
-                          const i = dt.findIndex((f) => f == a.key);
-                          if (i > -1) {
-                            dt.splice(i, 1);
-                          } else {
-                            dt.push(a.key);
-                          }
-                        });
-                      }}
-                    >
-                      [{a.values.length}/{existAnnotations.length}]{a.key}
-                      {delTags.includes(a.key) && <span style={{ background: "#990000", color: "#fff" }}>[待删除]</span>}
-                    </span>
-                  ))}
+                设置
               </span>
-            )}
-            {params.ids && (
-              <>
+              {existTags.length > 0 && (
                 <span
                   style={{
-                    ...tagStyle,
-                    background: delTags.length > 0 ? "#990000" : "#009900",
-                    color: "#fff",
-                  }}
-                  onClick={() => {
-                    setIsPopoverOpen(false);
-
-                    saveAnnotationTags("", [], delTags, reader, params, doc);
-                    root?.remove();
+                    display: "flex",
+                    flexWrap: "wrap",
+                    fontSize: fontSize + "px",
+                    lineHeight: lineHeight,
+                    alignItems: "center",
                   }}
                 >
-                  {delTags.length == 0 ? (autoCloseSeconds > 0 ? autoCloseSeconds + "s" : "点击") + "关闭" : "确认删除"}
+                  现有标签：
+                  {groupBy(existTags, (a) => a)
+                    .sort(sortValuesLength)
+                    .map((a) => (
+                      <span
+                        key={a.key}
+                        style={{
+                          ...tagStyle,
+                          whiteSpace: "nowrap",
+                          wordWrap: "normal",
+                          backgroundColor: memFixedColor(a.key, ""),
+                          boxShadow: "#ccc 0px 0px 4px 3px",
+                        }}
+                        onClick={() => {
+                          updateDelTags((dt) => {
+                            const i = dt.findIndex((f) => f == a.key);
+                            if (i > -1) {
+                              dt.splice(i, 1);
+                            } else {
+                              dt.push(a.key);
+                            }
+                          });
+                        }}
+                      >
+                        [{a.values.length}/{existAnnotations.length}]{a.key}
+                        {delTags.includes(a.key) && <span style={{ background: "#990000", color: "#fff" }}>[待删除]</span>}
+                      </span>
+                    ))}
                 </span>
-              </>
-            )}
-            <input
-              type="text"
-              autoFocus={true}
-              defaultValue={searchTag}
-              onInput={(e) => setSearchTag(e.currentTarget.value)}
-              style={{ ...inputWidth(searchTag), minWidth: "18ch" }}
-              placeholder="搜索标签，按回车添加"
-              onKeyDown={(e) => {
-                // ztoolkit.log(e)
-                if (autoCloseSeconds > 0) {
-                  setAutoCloseSeconds(-1);
-                }
-                if (e.code == "Enter") {
-                  setIsPopoverOpen(false);
-                  saveAnnotationTags(searchTag, [], [], reader, params, doc);
-                  if (params.ids) {
+              )}
+              {params.ids && (
+                <>
+                  <span
+                    style={{
+                      ...tagStyle,
+                      background: delTags.length > 0 ? "#990000" : "#009900",
+                      color: "#fff",
+                    }}
+                    onClick={() => {
+                      setIsPopoverOpen(false);
+
+                      saveAnnotationTags("", [], delTags, reader, params, doc);
+                      root?.remove();
+                    }}
+                  >
+                    {delTags.length == 0 ? (autoCloseSeconds > 0 ? autoCloseSeconds + "s" : "点击") + "关闭" : "确认删除"}
+                  </span>
+                </>
+              )}
+              <input
+                type="text"
+                autoFocus={true}
+                defaultValue={searchTag}
+                onInput={(e) => setSearchTag(e.currentTarget.value)}
+                style={{ ...inputWidth(searchTag), minWidth: "18ch" }}
+                placeholder="搜索标签，按回车添加"
+                onKeyDown={(e) => {
+                  // ztoolkit.log(e)
+                  if (autoCloseSeconds > 0) {
+                    setAutoCloseSeconds(-1);
+                  }
+                  if (e.code == "Enter") {
+                    setIsPopoverOpen(false);
+                    saveAnnotationTags(searchTag, [], [], reader, params, doc);
+                    if (params.ids) {
+                      root.remove();
+                    }
+                    return;
+                  }
+                  if (e.code == "Escape") {
+                    //@ts-ignore _onSetSelectionPopup
+                    reader?._primaryView._onSetSelectionPopup(null);
                     root.remove();
+                    return;
                   }
-                  return;
-                }
-                if (e.code == "Escape") {
-                  //@ts-ignore _onSetSelectionPopup
-                  reader?._primaryView._onSetSelectionPopup(null);
-                  root.remove();
-                  return;
-                }
-              }}
-            />
-            {/* <span style={tagStyle}>
+                }}
+              />
+              {/* <span style={tagStyle}>
                           固定标签来自【{currentPosition}】
                         </span>
                         <span style={tagStyle}>
                           相关标签来自【{currentPosition}】
                         </span> */}
-            <span style={tagStyle}>
-              {" "}
-              {displayTags.length}/{searchResultLength}:
-            </span>
-            {displayTags.map((tag) => (
-              <span
-                key={tag.key}
-                style={{
-                  ...tagStyle,
-                  whiteSpace: "nowrap",
-                  wordWrap: "normal",
-                  backgroundColor: tag.color,
-                  boxShadow: "#ccc 0px 0px 4px 3px",
-                  // borderRadius: "3px",
-                }}
-                onClick={() => {
-                  if (isShowConfig) return;
-                  setIsPopoverOpen(false);
-                  saveAnnotationTags(tag.key, [], [], reader, params, doc);
-                  if (params.ids) {
-                    root.remove();
-                  }
-                }}
-              >
-                <span>[{tag.values.length}]</span>
-                <span>{tag.key}</span>
+              <span style={tagStyle}>
+                {" "}
+                {displayTags.length}/{searchResultLength}:
+              </span>
+              {displayTags.map((tag) => (
+                <span
+                  key={tag.key}
+                  style={{
+                    ...tagStyle,
+                    whiteSpace: "nowrap",
+                    wordWrap: "normal",
+                    backgroundColor: tag.color,
+                    boxShadow: "#ccc 0px 0px 4px 3px",
+                    // borderRadius: "3px",
+                  }}
+                  onClick={() => {
+                    if (isShowConfig) return;
+                    setIsPopoverOpen(false);
+                    saveAnnotationTags(tag.key, [], [], reader, params, doc);
+                    if (params.ids) {
+                      root.remove();
+                    }
+                  }}
+                >
+                  <span>[{tag.values.length}]</span>
+                  <span>{tag.key}</span>
 
-                {isShowConfig && (
-                  <>
-                    {memFixedTags().includes(tag.key) ? (
-                      <>
-                        <ChangeColor
-                          color={memFixedColor(tag.key)}
-                          onChange={(e) => {
-                            updateDisplayTags((a) => {
-                              for (const b of a) {
-                                if (b.key == tag.key) {
-                                  b.color = e;
+                  {isShowConfig && (
+                    <>
+                      {memFixedTags().includes(tag.key) ? (
+                        <>
+                          <ChangeColor
+                            color={memFixedColor(tag.key)}
+                            onChange={(e) => {
+                              updateDisplayTags((a) => {
+                                for (const b of a) {
+                                  if (b.key == tag.key) {
+                                    b.color = e;
+                                  }
                                 }
-                              }
-                            });
-                          }}
-                        >
-                          <span style={{ background: "#fff" }}>颜色</span>
-                        </ChangeColor>
-                        {/* <span
+                              });
+                            }}
+                          >
+                            <span style={{ background: "#fff" }}>颜色</span>
+                          </ChangeColor>
+                          {/* <span
                                                             style={{
                                                                 background: "#fff",
                                                                 color: "#000",
@@ -1333,27 +1332,27 @@ export function PopupRoot({
                                                         >
                                                             右移
                                                         </span> */}
-                      </>
-                    ) : (
-                      <span
-                        style={{
-                          background: "#fff",
-                          color: "#000",
-                          border: "1px solid #000",
-                        }}
-                      >
-                        {/* 设置固定 */}
-                      </span>
-                    )}
-                  </>
-                )}
-              </span>
-            ))}
-          </span>
+                        </>
+                      ) : (
+                        <span
+                          style={{
+                            background: "#fff",
+                            color: "#000",
+                            border: "1px solid #000",
+                          }}
+                        >
+                          {/* 设置固定 */}
+                        </span>
+                      )}
+                    </>
+                  )}
+                </span>
+              ))}
+            </span>
+          </div>
         </div>
       </div>
-    </div>
-  ),
+    ),
     [
       configName,
       pSingleWindow,
@@ -1380,7 +1379,7 @@ export function PopupRoot({
       divMaxHeight,
       buttonBorderRadius,
     ],
-  )
+  );
   const handleContent = React.useCallback(
     (popoverState: PopoverState) => (
       <ArrowContainer // if you'd like an arrow, you can import the ArrowContainer!
@@ -1427,11 +1426,7 @@ export function PopupRoot({
   );
   {
     if (!pSingleWindow) {
-      return (
-        <>
-          {handleContentDiv()}
-        </>
-      )
+      return <>{handleContentDiv()}</>;
     }
     return (
       <>