Bump preact from 10.5.13 to 10.5.15

src/annotator/components/NotebookModal.js

@@ -33,6 +33,8 @@ function NotebookIframe({ config, groupId }) {
   );
 }
 
+/** @typedef {import('../util/emitter').Emitter} Emitter */
+
 /**
  * @typedef NotebookModalProps
  * @prop {import('../util/emitter').EventBus} eventBus
@@ -53,9 +55,7 @@ export default function NotebookModal({ eventBus, config }) {
   const [isHidden, setIsHidden] = useState(true);
   const [groupId, setGroupId] = useState(/** @type {string|null} */ (null));
   const originalDocumentOverflowStyle = useRef('');
-  const emitter = useRef(
-    /** @type {ReturnType<eventBus['createEmitter']>|null} */ (null)
-  );
+  const emitterRef = useRef(/** @type {Emitter|null} */ (null));
 
   // Stores the original overflow CSS property of document.body and reset it
   // when the component is destroyed
@@ -78,24 +78,22 @@ export default function NotebookModal({ eventBus, config }) {
   }, [isHidden]);
 
   useEffect(() => {
-    emitter.current = eventBus.createEmitter();
-    emitter.current.subscribe(
-      'openNotebook',
-      (/** @type {string} */ groupId) => {
-        setIsHidden(false);
-        setIframeKey(iframeKey => iframeKey + 1);
-        setGroupId(groupId);
-      }
-    );
+    const emitter = eventBus.createEmitter();
+    emitter.subscribe('openNotebook', (/** @type {string} */ groupId) => {
+      setIsHidden(false);
+      setIframeKey(iframeKey => iframeKey + 1);
+      setGroupId(groupId);
+    });
+    emitterRef.current = emitter;
 
     return () => {
-      emitter.current.destroy();
+      emitter.destroy();
     };
   }, [eventBus]);
 
   const onClose = () => {
     setIsHidden(true);
-    emitter.current.publish('closeNotebook');
+    emitterRef.current?.publish('closeNotebook');
   };
 
   if (groupId === null) {

src/annotator/util/emitter.js

@@ -10,7 +10,7 @@ import { TinyEmitter } from 'tiny-emitter';
  *
  * @implements Destroyable
  */
-class Emitter {
+export class Emitter {
   /**
    * @param {TinyEmitter} emitter
    */

src/sidebar/components/Annotation/AnnotationShareControl.js

@@ -60,6 +60,9 @@ function AnnotationShareControl({
   const closePanel = () => setOpen(false);
 
   // Interactions outside of the component when it is open should close it
+  //
+  // @ts-expect-error - `useElementShouldClose` requires a non-nullable ref,
+  // but `shareRef` is nullable.
   useElementShouldClose(shareRef, isOpen, closePanel);
 
   useEffect(() => {

src/sidebar/components/Excerpt.js

@@ -87,7 +87,7 @@ function Excerpt({
     useState(true);
 
   // Container for the excerpt's content.
-  const contentElement = useRef(/** @type {HTMLDivElement|null} */ (null));
+  const contentElement = /** @type {{ current: HTMLDivElement }} */ (useRef());
 
   // Measured height of `contentElement` in pixels.
   const [contentHeight, setContentHeight] = useState(0);

src/sidebar/components/MarkdownEditor.js

@@ -402,15 +402,16 @@ export default function MarkdownEditor({
 
   useEffect(() => {
     if (!preview) {
-      input.current.focus();
+      input.current?.focus();
     }
   }, [preview]);
 
   const togglePreview = () => setPreview(!preview);
   const handleCommand = command => {
-    const inputEl = input.current;
-    handleToolbarCommand(command, inputEl);
-    onEditText({ text: inputEl.value });
+    if (input.current) {
+      handleToolbarCommand(command, input.current);
+      onEditText({ text: input.current.value });
+    }
   };
 
   const handleKeyDown = event => {

src/sidebar/components/MarkdownView.js

@@ -28,7 +28,7 @@ export default function MarkdownView({
     () => (markdown ? renderMarkdown(markdown) : ''),
     [markdown]
   );
-  const content = useRef(/** @type {HTMLDivElement|null} */ (null));
+  const content = /** @type {{ current: HTMLDivElement }} */ (useRef());
 
   useEffect(() => {
     replaceLinksWithEmbeds(content.current, {

src/sidebar/components/Menu.js

@@ -138,7 +138,7 @@ export default function Menu({
   //
   // These handlers close the menu when the user taps or clicks outside the
   // menu or presses Escape.
-  const menuRef = useRef(/** @type {HTMLDivElement|null} */ (null));
+  const menuRef = /** @type {{ current: HTMLDivElement }} */ (useRef());
 
   // Menu element should close via `closeMenu` whenever it's open and there
   // are user interactions outside of it (e.g. clicks) in the document

src/sidebar/components/MenuItem.js

@@ -81,9 +81,9 @@ export default function MenuItem({
   const hasLeftIcon = icon || isSubmenuItem;
   const hasRightIcon = icon && isSubmenuItem;
 
-  const menuItemRef = useRef(
-    /** @type {(HTMLAnchorElement & HTMLDivElement)|null} */ (null)
-  );
+  const menuItemRef =
+    /** @type {{ current: HTMLAnchorElement & HTMLDivElement }} */ (useRef());
+
   let focusTimer = null;
 
   let renderedIcon = null;

src/sidebar/components/MenuKeyboardNavigation.js

@@ -28,7 +28,7 @@ export default function MenuKeyboardNavigation({
   children,
   visible,
 }) {
-  const menuRef = useRef(/** @type {HTMLDivElement|null} */ (null));
+  const menuRef = /** @type {{ current: HTMLDivElement }} */ (useRef());
 
   useEffect(() => {
     let focusTimer = null;

src/sidebar/components/SearchInput.js

@@ -28,7 +28,7 @@ import { useStoreProxy } from '../store/use-store';
 export default function SearchInput({ alwaysExpanded, query, onSearch }) {
   const store = useStoreProxy();
   const isLoading = store.isLoading();
-  const input = useRef(/** @type {HTMLInputElement|null} */ (null));
+  const input = /** @type {{ current: HTMLInputElement }} */ (useRef());
 
   // The active filter query from the previous render.
   const [prevQuery, setPrevQuery] = useState(query);

src/sidebar/components/Slider.js

@@ -19,7 +19,7 @@ import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
  * @param {SliderProps} props
  */
 export default function Slider({ children, visible }) {
-  const containerRef = useRef(/** @type {HTMLDivElement|null} */ (null));
+  const containerRef = /** @type {{ current: HTMLDivElement }} */ (useRef());
   const [containerHeight, setContainerHeight] = useState(visible ? 'auto' : 0);
 
   // Whether the content is currently partially or wholly visible. This is

src/sidebar/components/TagEditor.js

@@ -38,7 +38,7 @@ function TagEditor({
   tagList,
   tags: tagsService,
 }) {
-  const inputEl = useRef(/** @type {HTMLInputElement|null} */ (null));
+  const inputEl = /** @type {{ current: HTMLInputElement }} */ (useRef());
   const [suggestions, setSuggestions] = useState(/** @type {string[]} */ ([]));
   const [activeItem, setActiveItem] = useState(-1); // -1 is unselected
   const [suggestionsListOpen, setSuggestionsListOpen] = useState(false);
@@ -48,7 +48,7 @@ function TagEditor({
   });
 
   // Set up callback to monitor outside click events to close the AutocompleteList
-  const closeWrapperRef = useRef(/** @type {HTMLElement|null} */ (null));
+  const closeWrapperRef = /** @type {{ current: HTMLElement }} */ (useRef());
   useElementShouldClose(closeWrapperRef, suggestionsListOpen, () => {
     setSuggestionsListOpen(false);
   });

src/sidebar/store/use-store.js

@@ -144,5 +144,5 @@ export function useStoreProxy() {
     return cleanup;
   }, [cache, store]);
 
-  return proxy.current;
+  return /** @type {SidebarStore} */ (proxy.current);
 }

yarn.lock

@@ -5937,9 +5937,9 @@ postcss@^8.0.3:
     source-map-js "^0.6.2"
 
 preact@^10.4.0:
-  version "10.5.13"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.13.tgz#85f6c9197ecd736ce8e3bec044d08fd1330fa019"
-  integrity sha512-q/vlKIGNwzTLu+jCcvywgGrt+H/1P/oIRSD6mV4ln3hmlC+Aa34C7yfPI4+5bzW8pONyVXYS7SvXosy2dKKtWQ==
+  version "10.5.15"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.15.tgz#6df94d8afecf3f9e10a742fd8c362ddab464225f"
+  integrity sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==
 
 prelude-ls@^1.2.1:
   version "1.2.1"