Upload folder using huggingface_hub

README.md

@@ -1,19 +1,3 @@
----
-tags:
-- gradio-custom-component
-- gradio-template-Image
-- bounding box
-- annotator
-- annotate
-- boxes
-title: gradio_image_annotation V0.4.0
-colorFrom: yellow
-colorTo: green
-sdk: docker
-pinned: false
-license: apache-2.0
-short_description: A Gradio component for image annotation
----
 
 # `gradio_image_annotation`
 <a href="https://pypi.org/project/gradio_image_annotation/" target="_blank"><img alt="PyPI - Version" src="https://img.shields.io/pypi/v/gradio_image_annotation"></a>  
@@ -184,11 +168,11 @@ dict | None
 <td align="left" style="width: 25%;">
 
 ```python
-float | None
+float
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>0.5</code></td>
 <td align="left">Opacity of the bounding boxes 0 and 1.</td>
 </tr>
 
@@ -197,11 +181,11 @@ float | None
 <td align="left" style="width: 25%;">
 
 ```python
-list[str] | None
+list[str]
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>[]</code></td>
 <td align="left">List of valid labels.</td>
 </tr>
 
@@ -210,11 +194,11 @@ list[str] | None
 <td align="left" style="width: 25%;">
 
 ```python
-list[str] | None
+list[str]
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>[]</code></td>
 <td align="left">Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).</td>
 </tr>
 
@@ -223,11 +207,11 @@ list[str] | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>10</code></td>
 <td align="left">Minimum valid bounding box size.</td>
 </tr>
 
@@ -236,11 +220,11 @@ int | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>8</code></td>
 <td align="left">Size of the bounding box resize handles.</td>
 </tr>
 
@@ -249,11 +233,11 @@ int | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>2</code></td>
 <td align="left">Thickness of the bounding box outline.</td>
 </tr>
 
@@ -262,11 +246,11 @@ int | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>4</code></td>
 <td align="left">Thickness of the bounding box outline when it is selected.</td>
 </tr>
 

app.py

@@ -1,109 +1,109 @@
-import gradio as gr
-from gradio_image_annotation import image_annotator
-import numpy as np
-
-
-example_annotation = {
-    "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
-    "boxes": [
-        {
-            "xmin": 636,
-            "ymin": 575,
-            "xmax": 801,
-            "ymax": 697,
-            "label": "Vehicle",
-            "color": (255, 0, 0)
-        },
-        {
-            "xmin": 360,
-            "ymin": 615,
-            "xmax": 386,
-            "ymax": 702,
-            "label": "Person",
-            "color": (0, 255, 0)
-        }
-    ]
-}
-
-examples_crop = [
-    {
-        "image": "https://raw.githubusercontent.com/gradio-app/gradio/main/guides/assets/logo.png",
-        "boxes": [
-            {
-                "xmin": 30,
-                "ymin": 70,
-                "xmax": 530,
-                "ymax": 500,
-                "color": (100, 200, 255),
-            }
-        ],
-    },
-    {
-        "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
-        "boxes": [
-            {
-                "xmin": 636,
-                "ymin": 575,
-                "xmax": 801,
-                "ymax": 697,
-                "color": (255, 0, 0),
-            },
-        ],
-    },
-]
-
-
-def crop(annotations):
-    if angle := annotations.get("orientation", None):
-        annotations["image"] = np.rot90(annotations["image"], k=-angle)
-    if annotations["boxes"]:
-        box = annotations["boxes"][0]
-        return annotations["image"][
-            box["ymin"]:box["ymax"],
-            box["xmin"]:box["xmax"]
-        ]
-    return None
-
-
-def get_boxes_json(annotations):
-    return annotations["boxes"]
-
-
-with gr.Blocks() as demo:
-    with gr.Tab("Object annotation", id="tab_object_annotation"):
-        annotator = image_annotator(
-            example_annotation,
-            label_list=["Person", "Vehicle"],
-            label_colors=[(0, 255, 0), (255, 0, 0)],
-        )
-        button_get = gr.Button("Get bounding boxes")
-        json_boxes = gr.JSON()
-        button_get.click(get_boxes_json, annotator, json_boxes)
-
-    with gr.Tab("Crop", id="tab_crop"):
-        with gr.Row():
-            annotator_crop = image_annotator(
-                examples_crop[0],
-                image_type="numpy",
-                disable_edit_boxes=True,
-                single_box=True,
-            )
-            image_crop = gr.Image()
-        button_crop = gr.Button("Crop")
-        button_crop.click(crop, annotator_crop, image_crop)
-
-        gr.Examples(examples_crop, annotator_crop)
-
-    with gr.Accordion("Keyboard Shortcuts"):
-        gr.Markdown("""
-        - ``C``: Create mode
-        - ``D``: Drag mode
-        - ``E``: Edit selected box (same as double-click a box)
-        - ``Delete``: Remove selected box
-        - ``Space``: Reset view (zoom/pan)
-        - ``Enter``: Confirm modal dialog
-        - ``Escape``: Cancel/close modal dialog
-        """)
-
-if __name__ == "__main__":
-    demo.launch()
+import gradio as gr
+from gradio_image_annotation import image_annotator
+import numpy as np
+
+
+example_annotation = {
+    "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
+    "boxes": [
+        {
+            "xmin": 636,
+            "ymin": 575,
+            "xmax": 801,
+            "ymax": 697,
+            "label": "Vehicle",
+            "color": (255, 0, 0)
+        },
+        {
+            "xmin": 360,
+            "ymin": 615,
+            "xmax": 386,
+            "ymax": 702,
+            "label": "Person",
+            "color": (0, 255, 0)
+        }
+    ]
+}
+
+examples_crop = [
+    {
+        "image": "https://raw.githubusercontent.com/gradio-app/gradio/main/guides/assets/logo.png",
+        "boxes": [
+            {
+                "xmin": 30,
+                "ymin": 70,
+                "xmax": 530,
+                "ymax": 500,
+                "color": (100, 200, 255),
+            }
+        ],
+    },
+    {
+        "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
+        "boxes": [
+            {
+                "xmin": 636,
+                "ymin": 575,
+                "xmax": 801,
+                "ymax": 697,
+                "color": (255, 0, 0),
+            },
+        ],
+    },
+]
+
+
+def crop(annotations):
+    if angle := annotations.get("orientation", None):
+        annotations["image"] = np.rot90(annotations["image"], k=-angle)
+    if annotations["boxes"]:
+        box = annotations["boxes"][0]
+        return annotations["image"][
+            box["ymin"]:box["ymax"],
+            box["xmin"]:box["xmax"]
+        ]
+    return None
+
+
+def get_boxes_json(annotations):
+    return annotations["boxes"]
+
+
+with gr.Blocks() as demo:
+    with gr.Tab("Object annotation", id="tab_object_annotation"):
+        annotator = image_annotator(
+            example_annotation,
+            label_list=["Person", "Vehicle"],
+            label_colors=[(0, 255, 0), (255, 0, 0)],
+        )
+        button_get = gr.Button("Get bounding boxes")
+        json_boxes = gr.JSON()
+        button_get.click(get_boxes_json, annotator, json_boxes)
+
+    with gr.Tab("Crop", id="tab_crop"):
+        with gr.Row():
+            annotator_crop = image_annotator(
+                examples_crop[0],
+                image_type="numpy",
+                disable_edit_boxes=True,
+                single_box=True,
+            )
+            image_crop = gr.Image()
+        button_crop = gr.Button("Crop")
+        button_crop.click(crop, annotator_crop, image_crop)
+
+        gr.Examples(examples_crop, annotator_crop)
+
+    with gr.Accordion("Keyboard Shortcuts"):
+        gr.Markdown("""
+        - ``C``: Create mode
+        - ``D``: Drag mode
+        - ``E``: Edit selected box (same as double-click a box)
+        - ``Delete``: Remove selected box
+        - ``Space``: Reset view (zoom/pan)
+        - ``Enter``: Confirm modal dialog
+        - ``Escape``: Cancel/close modal dialog
+        """)
+
+if __name__ == "__main__":
+    demo.launch()

space.py

@@ -3,7 +3,7 @@ import gradio as gr
 from app import demo as app
 import os
 
-_docs = {'image_annotator': {'description': 'Creates a component to annotate images with bounding boxes. The bounding boxes can be created and edited by the user or be passed by code.\nIt is also possible to predefine a set of valid classes and colors.', 'members': {'__init__': {'value': {'type': 'dict | None', 'default': 'None', 'description': "A dict or None. The dictionary must contain a key 'image' with either an URL to an image, a numpy image or a PIL image. Optionally it may contain a key 'boxes' with a list of boxes. Each box must be a dict wit the keys: 'xmin', 'ymin', 'xmax' and 'ymax' with the absolute image coordinates of the box. Optionally can also include the keys 'label' and 'color' describing the label and color of the box. Color must be a tuple of RGB values (e.g. `(255,255,255)`). Optionally can also include the keys 'orientation' with a integer between 0 and 3, describing the number of times the image is rotated by 90 degrees in frontend, the rotation is clockwise."}, 'boxes_alpha': {'type': 'float | None', 'default': 'None', 'description': 'Opacity of the bounding boxes 0 and 1.'}, 'label_list': {'type': 'list[str] | None', 'default': 'None', 'description': 'List of valid labels.'}, 'label_colors': {'type': 'list[str] | None', 'default': 'None', 'description': 'Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).'}, 'box_min_size': {'type': 'int | None', 'default': 'None', 'description': 'Minimum valid bounding box size.'}, 'handle_size': {'type': 'int | None', 'default': 'None', 'description': 'Size of the bounding box resize handles.'}, 'box_thickness': {'type': 'int | None', 'default': 'None', 'description': 'Thickness of the bounding box outline.'}, 'box_selected_thickness': {'type': 'int | None', 'default': 'None', 'description': 'Thickness of the bounding box outline when it is selected.'}, 'disable_edit_boxes': {'type': 'bool | None', 'default': 'None', 'description': 'Disables the ability to set and edit the label and color of the boxes.'}, 'single_box': {'type': 'bool', 'default': 'False', 'description': 'If True, at most one box can be drawn.'}, 'height': {'type': 'int | str | None', 'default': 'None', 'description': 'The height of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'width': {'type': 'int | str | None', 'default': 'None', 'description': 'The width of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'image_mode': {'type': '"1"\n    | "L"\n    | "P"\n    | "RGB"\n    | "RGBA"\n    | "CMYK"\n    | "YCbCr"\n    | "LAB"\n    | "HSV"\n    | "I"\n    | "F"', 'default': '"RGB"', 'description': '"RGB" if color, or "L" if black and white. See https://pillow.readthedocs.io/en/stable/handbook/concepts.html for other supported image modes and their meaning.'}, 'sources': {'type': 'list["upload" | "webcam" | "clipboard"] | None', 'default': '["upload", "webcam", "clipboard"]', 'description': 'List of sources for the image. "upload" creates a box where user can drop an image file, "webcam" allows user to take snapshot from their webcam, "clipboard" allows users to paste an image from the clipboard. If None, defaults to ["upload", "webcam", "clipboard"].'}, 'image_type': {'type': '"numpy" | "pil" | "filepath"', 'default': '"numpy"', 'description': 'The format the image is converted before being passed into the prediction function. "numpy" converts the image to a numpy array with shape (height, width, 3) and values from 0 to 255, "pil" converts the image to a PIL image object, "filepath" passes a str path to a temporary file containing the image. If the image is SVG, the `type` is ignored and the filepath of the SVG is returned.'}, 'label': {'type': 'str | None', 'default': 'None', 'description': 'The label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.'}, 'container': {'type': 'bool', 'default': 'True', 'description': 'If True, will place the component in a container - providing some extra padding around the border.'}, 'scale': {'type': 'int | None', 'default': 'None', 'description': 'relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.'}, 'min_width': {'type': 'int', 'default': '160', 'description': 'minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.'}, 'interactive': {'type': 'bool | None', 'default': 'True', 'description': 'if True, will allow users to upload and annotate an image; if False, can only be used to display annotated images.'}, 'visible': {'type': 'bool', 'default': 'True', 'description': 'If False, component will be hidden.'}, 'elem_id': {'type': 'str | None', 'default': 'None', 'description': 'An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'elem_classes': {'type': 'list[str] | str | None', 'default': 'None', 'description': 'An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'render': {'type': 'bool', 'default': 'True', 'description': 'If False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.'}, 'show_label': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will display label.'}, 'show_download_button': {'type': 'bool', 'default': 'True', 'description': 'If True, will show a button to download the image.'}, 'show_share_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.'}, 'show_clear_button': {'type': 'bool | None', 'default': 'True', 'description': 'If True, will show a button to clear the current image.'}, 'show_remove_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a button to remove the selected bounding box.'}, 'handles_cursor': {'type': 'bool | None', 'default': 'True', 'description': 'If True, the cursor will change when hovering over box handles in drag mode. Can be CPU-intensive.'}, 'use_default_label': {'type': 'bool | None', 'default': 'False', 'description': 'If True, the first item in label_list will be used as the default label when creating boxes.'}, 'enable_keyboard_shortcuts': {'type': 'bool', 'default': 'True', 'description': 'If True, the component will respond to keyboard events.'}}, 'postprocess': {'value': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with an image and an optional list of boxes or None.'}}, 'preprocess': {'return': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with the image and boxes or None.'}, 'value': None}}, 'events': {'clear': {'type': None, 'default': None, 'description': 'This listener is triggered when the user clears the image_annotator using the clear button for the component.'}, 'change': {'type': None, 'default': None, 'description': 'Triggered when the value of the image_annotator changes either because of user input (e.g. a user types in a textbox) OR because of a function update (e.g. an image receives a value from the output of an event trigger). See `.input()` for a listener that is only triggered by user input.'}, 'upload': {'type': None, 'default': None, 'description': 'This listener is triggered when the user uploads a file into the image_annotator.'}}}, '__meta__': {'additional_interfaces': {'AnnotatedImageValue': {'source': 'class AnnotatedImageValue(TypedDict):\n    image: Optional[np.ndarray | PIL.Image.Image | str]\n    boxes: Optional[List[dict]]\n    orientation: Optional[int]'}}, 'user_fn_refs': {'image_annotator': ['AnnotatedImageValue']}}}
+_docs = {'image_annotator': {'description': 'Creates a component to annotate images with bounding boxes. The bounding boxes can be created and edited by the user or be passed by code.\nIt is also possible to predefine a set of valid classes and colors.', 'members': {'__init__': {'value': {'type': 'dict | None', 'default': 'None', 'description': "A dict or None. The dictionary must contain a key 'image' with either an URL to an image, a numpy image or a PIL image. Optionally it may contain a key 'boxes' with a list of boxes. Each box must be a dict wit the keys: 'xmin', 'ymin', 'xmax' and 'ymax' with the absolute image coordinates of the box. Optionally can also include the keys 'label' and 'color' describing the label and color of the box. Color must be a tuple of RGB values (e.g. `(255,255,255)`). Optionally can also include the keys 'orientation' with a integer between 0 and 3, describing the number of times the image is rotated by 90 degrees in frontend, the rotation is clockwise."}, 'boxes_alpha': {'type': 'float', 'default': '0.5', 'description': 'Opacity of the bounding boxes 0 and 1.'}, 'label_list': {'type': 'list[str]', 'default': '[]', 'description': 'List of valid labels.'}, 'label_colors': {'type': 'list[str]', 'default': '[]', 'description': 'Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).'}, 'box_min_size': {'type': 'int', 'default': '10', 'description': 'Minimum valid bounding box size.'}, 'handle_size': {'type': 'int', 'default': '8', 'description': 'Size of the bounding box resize handles.'}, 'box_thickness': {'type': 'int', 'default': '2', 'description': 'Thickness of the bounding box outline.'}, 'box_selected_thickness': {'type': 'int', 'default': '4', 'description': 'Thickness of the bounding box outline when it is selected.'}, 'disable_edit_boxes': {'type': 'bool | None', 'default': 'None', 'description': 'Disables the ability to set and edit the label and color of the boxes.'}, 'single_box': {'type': 'bool', 'default': 'False', 'description': 'If True, at most one box can be drawn.'}, 'height': {'type': 'int | str | None', 'default': 'None', 'description': 'The height of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'width': {'type': 'int | str | None', 'default': 'None', 'description': 'The width of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'image_mode': {'type': '"1"\n    | "L"\n    | "P"\n    | "RGB"\n    | "RGBA"\n    | "CMYK"\n    | "YCbCr"\n    | "LAB"\n    | "HSV"\n    | "I"\n    | "F"', 'default': '"RGB"', 'description': '"RGB" if color, or "L" if black and white. See https://pillow.readthedocs.io/en/stable/handbook/concepts.html for other supported image modes and their meaning.'}, 'sources': {'type': 'list["upload" | "webcam" | "clipboard"] | None', 'default': '["upload", "webcam", "clipboard"]', 'description': 'List of sources for the image. "upload" creates a box where user can drop an image file, "webcam" allows user to take snapshot from their webcam, "clipboard" allows users to paste an image from the clipboard. If None, defaults to ["upload", "webcam", "clipboard"].'}, 'image_type': {'type': '"numpy" | "pil" | "filepath"', 'default': '"numpy"', 'description': 'The format the image is converted before being passed into the prediction function. "numpy" converts the image to a numpy array with shape (height, width, 3) and values from 0 to 255, "pil" converts the image to a PIL image object, "filepath" passes a str path to a temporary file containing the image. If the image is SVG, the `type` is ignored and the filepath of the SVG is returned.'}, 'label': {'type': 'str | None', 'default': 'None', 'description': 'The label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.'}, 'container': {'type': 'bool', 'default': 'True', 'description': 'If True, will place the component in a container - providing some extra padding around the border.'}, 'scale': {'type': 'int | None', 'default': 'None', 'description': 'relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.'}, 'min_width': {'type': 'int', 'default': '160', 'description': 'minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.'}, 'interactive': {'type': 'bool | None', 'default': 'True', 'description': 'if True, will allow users to upload and annotate an image; if False, can only be used to display annotated images.'}, 'visible': {'type': 'bool', 'default': 'True', 'description': 'If False, component will be hidden.'}, 'elem_id': {'type': 'str | None', 'default': 'None', 'description': 'An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'elem_classes': {'type': 'list[str] | str | None', 'default': 'None', 'description': 'An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'render': {'type': 'bool', 'default': 'True', 'description': 'If False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.'}, 'show_label': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will display label.'}, 'show_download_button': {'type': 'bool', 'default': 'True', 'description': 'If True, will show a button to download the image.'}, 'show_share_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.'}, 'show_clear_button': {'type': 'bool | None', 'default': 'True', 'description': 'If True, will show a button to clear the current image.'}, 'show_remove_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a button to remove the selected bounding box.'}, 'handles_cursor': {'type': 'bool | None', 'default': 'True', 'description': 'If True, the cursor will change when hovering over box handles in drag mode. Can be CPU-intensive.'}, 'use_default_label': {'type': 'bool | None', 'default': 'False', 'description': 'If True, the first item in label_list will be used as the default label when creating boxes.'}, 'enable_keyboard_shortcuts': {'type': 'bool', 'default': 'True', 'description': 'If True, the component will respond to keyboard events.'}}, 'postprocess': {'value': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with an image and an optional list of boxes or None.'}}, 'preprocess': {'return': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with the image and boxes or None.'}, 'value': None}}, 'events': {'clear': {'type': None, 'default': None, 'description': 'This listener is triggered when the user clears the image_annotator using the clear button for the component.'}, 'change': {'type': None, 'default': None, 'description': 'Triggered when the value of the image_annotator changes either because of user input (e.g. a user types in a textbox) OR because of a function update (e.g. an image receives a value from the output of an event trigger). See `.input()` for a listener that is only triggered by user input.'}, 'upload': {'type': None, 'default': None, 'description': 'This listener is triggered when the user uploads a file into the image_annotator.'}}}, '__meta__': {'additional_interfaces': {'AnnotatedImageValue': {'source': 'class AnnotatedImageValue(TypedDict):\n    image: Optional[np.ndarray | PIL.Image.Image | str]\n    boxes: Optional[List[dict]]\n    orientation: Optional[int]'}}, 'user_fn_refs': {'image_annotator': ['AnnotatedImageValue']}}}
 
 abs_path = os.path.join(os.path.dirname(__file__), "css.css")
 
@@ -133,7 +133,7 @@ with gr.Blocks() as demo:
         button_crop.click(crop, annotator_crop, image_crop)
 
         gr.Examples(examples_crop, annotator_crop)
-    
+
     with gr.Accordion("Keyboard Shortcuts"):
         gr.Markdown(\"\"\"
         - ``C``: Create mode

src/.github/workflows/python-publish.yml

@@ -1,39 +1,39 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Upload Python Package
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-    - name: Build package
-      run: python -m build
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+    - name: Build package
+      run: python -m build
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

src/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 Edgar Gracia
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 Edgar Gracia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/README.md

@@ -168,11 +168,11 @@ dict | None
 <td align="left" style="width: 25%;">
 
 ```python
-float | None
+float
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>0.5</code></td>
 <td align="left">Opacity of the bounding boxes 0 and 1.</td>
 </tr>
 
@@ -181,11 +181,11 @@ float | None
 <td align="left" style="width: 25%;">
 
 ```python
-list[str] | None
+list[str]
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>[]</code></td>
 <td align="left">List of valid labels.</td>
 </tr>
 
@@ -194,11 +194,11 @@ list[str] | None
 <td align="left" style="width: 25%;">
 
 ```python
-list[str] | None
+list[str]
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>[]</code></td>
 <td align="left">Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).</td>
 </tr>
 
@@ -207,11 +207,11 @@ list[str] | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>10</code></td>
 <td align="left">Minimum valid bounding box size.</td>
 </tr>
 
@@ -220,11 +220,11 @@ int | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>8</code></td>
 <td align="left">Size of the bounding box resize handles.</td>
 </tr>
 
@@ -233,11 +233,11 @@ int | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>2</code></td>
 <td align="left">Thickness of the bounding box outline.</td>
 </tr>
 
@@ -246,11 +246,11 @@ int | None
 <td align="left" style="width: 25%;">
 
 ```python
-int | None
+int
 ```
 
 </td>
-<td align="left"><code>None</code></td>
+<td align="left"><code>4</code></td>
 <td align="left">Thickness of the bounding box outline when it is selected.</td>
 </tr>
 

src/backend/gradio_image_annotation/image_annotator.py

@@ -1,358 +1,358 @@
-from __future__ import annotations
-
-import re
-import warnings
-from pathlib import Path
-from typing import Any, List, Optional, Literal, TypedDict, cast
-
-import numpy as np
-import PIL.Image
-from PIL import ImageOps
-
-from gradio import image_utils, utils
-from gradio.components.base import Component
-from gradio.data_classes import FileData, GradioModel
-from gradio.events import Events
-
-PIL.Image.init()  # fixes https://github.com/gradio-app/gradio/issues/2843
-
-
-class AnnotatedImageData(GradioModel):
-    image: FileData
-    boxes: List[dict] = []
-    orientation: int = 0
-
-
-class AnnotatedImageValue(TypedDict):
-    image: Optional[np.ndarray | PIL.Image.Image | str]
-    boxes: Optional[List[dict]]
-    orientation: Optional[int]
-
-
-def rgb2hex(r,g,b):
-    def clip(x):
-        return max(min(x, 255), 0)
-    return "#{:02x}{:02x}{:02x}".format(clip(r),clip(g),clip(b))
-
-
-class image_annotator(Component):
-    """
-    Creates a component to annotate images with bounding boxes. The bounding boxes can be created and edited by the user or be passed by code.
-    It is also possible to predefine a set of valid classes and colors.
-    """
-
-    EVENTS = [
-        Events.clear,
-        Events.change,
-        Events.upload,
-    ]
-
-    data_model = AnnotatedImageData
-
-    def __init__(
-        self,
-        value: dict | None = None,
-        *,
-        boxes_alpha: float | None = None,
-        label_list: list[str] | None = None,
-        label_colors: list[str] | None = None,
-        box_min_size: int | None = None,
-        handle_size: int | None = None,
-        box_thickness: int | None = None,
-        box_selected_thickness: int | None = None,
-        disable_edit_boxes: bool | None = None,
-        single_box: bool = False,
-        height: int | str | None = None,
-        width: int | str | None = None,
-        image_mode: Literal[
-            "1", "L", "P", "RGB", "RGBA", "CMYK", "YCbCr", "LAB", "HSV", "I", "F"
-        ] = "RGB",
-        sources: list[Literal["upload", "webcam", "clipboard"]] | None = [
-            "upload",
-            "webcam",
-            "clipboard",
-        ],
-        image_type: Literal["numpy", "pil", "filepath"] = "numpy",
-        label: str | None = None,
-        container: bool = True,
-        scale: int | None = None,
-        min_width: int = 160,
-        interactive: bool | None = True,
-        visible: bool = True,
-        elem_id: str | None = None,
-        elem_classes: list[str] | str | None = None,
-        render: bool = True,
-        show_label: bool | None = None,
-        show_download_button: bool = True,
-        show_share_button: bool | None = None,
-        show_clear_button: bool | None = True,
-        show_remove_button: bool | None = None,
-        handles_cursor: bool | None = True,
-        use_default_label: bool | None = False,
-        enable_keyboard_shortcuts: bool = True, 
-    ):
-        """
-        Parameters:
-            value: A dict or None. The dictionary must contain a key 'image' with either an URL to an image, a numpy image or a PIL image. Optionally it may contain a key 'boxes' with a list of boxes. Each box must be a dict wit the keys: 'xmin', 'ymin', 'xmax' and 'ymax' with the absolute image coordinates of the box. Optionally can also include the keys 'label' and 'color' describing the label and color of the box. Color must be a tuple of RGB values (e.g. `(255,255,255)`). Optionally can also include the keys 'orientation' with a integer between 0 and 3, describing the number of times the image is rotated by 90 degrees in frontend, the rotation is clockwise.
-            boxes_alpha: Opacity of the bounding boxes 0 and 1.
-            label_list: List of valid labels.
-            label_colors: Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).
-            box_min_size: Minimum valid bounding box size.
-            handle_size: Size of the bounding box resize handles.
-            box_thickness: Thickness of the bounding box outline.
-            box_selected_thickness: Thickness of the bounding box outline when it is selected.
-            disable_edit_boxes: Disables the ability to set and edit the label and color of the boxes.
-            single_box: If True, at most one box can be drawn.
-            height: The height of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.
-            width: The width of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.
-            image_mode: "RGB" if color, or "L" if black and white. See https://pillow.readthedocs.io/en/stable/handbook/concepts.html for other supported image modes and their meaning.
-            sources: List of sources for the image. "upload" creates a box where user can drop an image file, "webcam" allows user to take snapshot from their webcam, "clipboard" allows users to paste an image from the clipboard. If None, defaults to ["upload", "webcam", "clipboard"].
-            image_type: The format the image is converted before being passed into the prediction function. "numpy" converts the image to a numpy array with shape (height, width, 3) and values from 0 to 255, "pil" converts the image to a PIL image object, "filepath" passes a str path to a temporary file containing the image. If the image is SVG, the `type` is ignored and the filepath of the SVG is returned.
-            label: The label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.
-            container: If True, will place the component in a container - providing some extra padding around the border.
-            scale: relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.
-            min_width: minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.
-            interactive: if True, will allow users to upload and annotate an image; if False, can only be used to display annotated images.
-            visible: If False, component will be hidden.
-            elem_id: An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.
-            elem_classes: An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.
-            render: If False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.
-            show_label: if True, will display label.
-            show_download_button: If True, will show a button to download the image.
-            show_share_button: If True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.
-            show_clear_button: If True, will show a button to clear the current image.
-            show_remove_button: If True, will show a button to remove the selected bounding box.
-            handles_cursor: If True, the cursor will change when hovering over box handles in drag mode. Can be CPU-intensive.
-            use_default_label: If True, the first item in label_list will be used as the default label when creating boxes.
-            enable_keyboard_shortcuts: If True, the component will respond to keyboard events.
-        """
-
-        valid_types = ["numpy", "pil", "filepath"]
-        if image_type not in valid_types:
-            raise ValueError(
-                f"Invalid value for parameter `type`: {type}. Please choose from one of: {valid_types}"
-            )
-        self.image_type = image_type
-        self.height = height
-        self.width = width
-        self.image_mode = image_mode
-        
-        self.sources = sources
-        valid_sources = ["upload", "clipboard", "webcam", None]
-        if isinstance(sources, str):
-            self.sources = [sources]
-        if self.sources is None:
-            self.sources = []
-        if self.sources is not None:
-            for source in self.sources:
-                if source not in valid_sources:
-                    raise ValueError(
-                        f"`sources` must a list consisting of elements in {valid_sources}"
-                    )
-        
-        self.show_download_button = show_download_button
-        self.show_share_button = (
-            (utils.get_space() is not None)
-            if show_share_button is None
-            else show_share_button
-        )
-        self.show_clear_button = show_clear_button
-        self.show_remove_button = show_remove_button
-        self.handles_cursor = handles_cursor
-        self.use_default_label = use_default_label
-        self.enable_keyboard_shortcuts = enable_keyboard_shortcuts
-
-        self.boxes_alpha = boxes_alpha
-        self.box_min_size = box_min_size
-        self.handle_size = handle_size
-        self.box_thickness = box_thickness
-        self.box_selected_thickness = box_selected_thickness
-        self.disable_edit_boxes = disable_edit_boxes
-        self.single_box = single_box
-        if label_list:
-            self.label_list = [(l, i) for i, l in enumerate(label_list)]
-        else:
-            self.label_list = None
-        
-        # Parse colors
-        self.label_colors = label_colors
-        if self.label_colors:
-            if (not isinstance(self.label_colors, list)
-                or self.label_list is None
-                or len(self.label_colors) != len(self.label_list)):
-                raise ValueError("``label_colors`` must be a list with the "
-                                 "same length as ``label_list``")
-            for i, color in enumerate(self.label_colors):
-                if isinstance(color, str):
-                    if len(color) != 7 or color[0] != "#":
-                        raise ValueError(f"Invalid color value {color}")
-                elif isinstance(color, (list, tuple)):
-                    self.label_colors[i] = rgb2hex(*color)
-
-        super().__init__(
-            label=label,
-            every=None,
-            show_label=show_label,
-            container=container,
-            scale=scale,
-            min_width=min_width,
-            interactive=interactive,
-            visible=visible,
-            elem_id=elem_id,
-            elem_classes=elem_classes,
-            render=render,
-            value=value,
-        )
-
-    def preprocess_image(self, image: FileData | None) -> str | None:
-        if image is None:
-            return None
-        file_path = Path(image.path)
-        if image.orig_name:
-            p = Path(image.orig_name)
-            name = p.stem
-            suffix = p.suffix.replace(".", "")
-            if suffix in ["jpg", "jpeg"]:
-                suffix = "jpeg"
-        else:
-            name = "image"
-            suffix = "png"
-
-        if suffix.lower() == "svg":
-            return str(file_path)
-        
-        im = PIL.Image.open(file_path)
-        exif = im.getexif()
-        # 274 is the code for image rotation and 1 means "correct orientation"
-        if exif.get(274, 1) != 1 and hasattr(ImageOps, "exif_transpose"):
-            try:
-                im = ImageOps.exif_transpose(im)
-            except Exception:
-                warnings.warn(
-                    f"Failed to transpose image {file_path} based on EXIF data."
-                )
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            im = im.convert(self.image_mode)
-        return image_utils.format_image(
-            im,
-            cast(Literal["numpy", "pil", "filepath"], self.image_type),
-            self.GRADIO_CACHE,
-            name=name,
-            format=suffix,
-        )
-
-    def preprocess_boxes(self, boxes: List[dict] | None) -> list:
-        parsed_boxes = []
-        for box in boxes:
-            new_box = {}
-            new_box["label"] = box.get("label", "")
-            new_box["color"] = (0,0,0)
-            if "color" in box:
-                match = re.match(r'rgb\((\d+), (\d+), (\d+)\)', box["color"])
-                if match:
-                    new_box["color"] = tuple(int(match.group(i)) for i in range(1, 4))
-            scale_factor = box.get("scaleFactor", 1)
-            new_box["xmin"] = round(box["xmin"] / scale_factor)
-            new_box["ymin"] = round(box["ymin"] / scale_factor)
-            new_box["xmax"] = round(box["xmax"] / scale_factor)
-            new_box["ymax"] = round(box["ymax"] / scale_factor)
-            parsed_boxes.append(new_box)
-        return parsed_boxes
-
-    def preprocess(self, payload: AnnotatedImageData | None) -> AnnotatedImageValue | None:
-        """
-        Parameters:
-            payload: an AnnotatedImageData object.
-        Returns:
-            A dict with the image and boxes or None.
-        """
-        if payload is None:
-            return None
-        
-        ret_value = {
-            "image": self.preprocess_image(payload.image),
-            "boxes": self.preprocess_boxes(payload.boxes),
-            "orientation": payload.orientation,
-        }
-        return ret_value
-
-    def postprocess(self, value: AnnotatedImageValue | None) -> AnnotatedImageData | None:
-        """
-        Parameters:
-            value: A dict with an image and an optional list of boxes or None.
-        Returns:
-            Returns an AnnotatedImageData object.
-        """
-        # Check value
-        if value is None:
-            return None
-        if not isinstance(value, dict):
-            raise ValueError(f"``value`` must be a dict. Got {type(value)}")
-    
-        # Check and get boxes
-        boxes = value.setdefault("boxes", [])
-        if boxes:
-            if not isinstance(value["boxes"], (list, tuple)):
-                raise ValueError(f"'boxes' must be a list of dicts. Got "
-                                 f"{type(value['boxes'])}")
-            for box in value["boxes"]:
-                if (not isinstance(box, dict)
-                    or not set(box.keys()).issubset({"label", "xmin", "ymin", "xmax", "ymax", "color"})
-                    or not set(box.keys()).issuperset({"xmin", "ymin", "xmax", "ymax"})
-                    ):
-                    raise ValueError("Box must be a dict with the following "
-                                     "keys: 'xmin', 'ymin', 'xmax', 'ymax', "
-                                     f"['label', 'color']'. Got {box}")
-
-        # Check and parse image
-        image = value.setdefault("image", None)
-        if image is not None:
-            if isinstance(image, str) and image.lower().endswith(".svg"):
-                image = FileData(path=image, orig_name=Path(image).name)
-            else:
-                saved = image_utils.save_image(image, self.GRADIO_CACHE)
-                orig_name = Path(saved).name if Path(saved).exists() else None
-                image = FileData(path=saved, orig_name=orig_name)
-        else:
-            raise ValueError(f"An image must be provided. Got {value}")
-        
-        orientation = value.setdefault("orientation", 0)
-        if orientation is None:
-            orientation = 0
-
-        return AnnotatedImageData(image=image, boxes=boxes, orientation=orientation)
-
-    def process_example(self, value: dict | None) -> FileData | None:
-        if value is None:
-            return None
-        if not isinstance(value, dict):
-            raise ValueError(f"``value`` must be a dict. Got {type(value)}")
-
-        image = value.setdefault("image", None)
-        if image is not None:
-            if isinstance(image, str) and image.lower().endswith(".svg"):
-                image = FileData(path=image, orig_name=Path(image).name)
-            else:
-                saved = image_utils.save_image(image, self.GRADIO_CACHE)
-                orig_name = Path(saved).name if Path(saved).exists() else None
-                image = FileData(path=saved, orig_name=orig_name)
-        else:
-            raise ValueError(f"An image must be provided. Got {value}")
-
-        return image
-
-    def example_inputs(self) -> Any:
-        return {
-            "image": "https://raw.githubusercontent.com/gradio-app/gradio/main/guides/assets/logo.png",
-            "boxes": [
-                {
-                    "xmin": 30,
-                    "ymin": 70,
-                    "xmax": 530,
-                    "ymax": 500,
-                    "label": "Gradio",
-                    "color": (250,185,0),
-                }
-            ]
-        }
+from __future__ import annotations
+
+import re
+import warnings
+from pathlib import Path
+from typing import Any, List, Optional, Literal, TypedDict, cast
+
+import numpy as np
+import PIL.Image
+from PIL import ImageOps
+
+from gradio import image_utils, utils
+from gradio.components.base import Component
+from gradio.data_classes import FileData, GradioModel
+from gradio.events import Events
+
+PIL.Image.init()  # fixes https://github.com/gradio-app/gradio/issues/2843
+
+
+class AnnotatedImageData(GradioModel):
+    image: FileData
+    boxes: List[dict] = []
+    orientation: int = 0
+
+
+class AnnotatedImageValue(TypedDict):
+    image: Optional[np.ndarray | PIL.Image.Image | str]
+    boxes: Optional[List[dict]]
+    orientation: Optional[int]
+
+
+def rgb2hex(r,g,b):
+    def clip(x):
+        return max(min(x, 255), 0)
+    return "#{:02x}{:02x}{:02x}".format(clip(r),clip(g),clip(b))
+
+
+class image_annotator(Component):
+    """
+    Creates a component to annotate images with bounding boxes. The bounding boxes can be created and edited by the user or be passed by code.
+    It is also possible to predefine a set of valid classes and colors.
+    """
+
+    EVENTS = [
+        Events.clear,
+        Events.change,
+        Events.upload,
+    ]
+
+    data_model = AnnotatedImageData
+
+    def __init__(
+        self,
+        value: dict | None = None,
+        *,
+        boxes_alpha: float = 0.5,
+        label_list: list[str] = [],
+        label_colors: list[str] = [],
+        box_min_size: int = 10,
+        handle_size: int = 8,
+        box_thickness: int = 2,
+        box_selected_thickness: int = 4,
+        disable_edit_boxes: bool | None = None,
+        single_box: bool = False,
+        height: int | str | None = None,
+        width: int | str | None = None,
+        image_mode: Literal[
+            "1", "L", "P", "RGB", "RGBA", "CMYK", "YCbCr", "LAB", "HSV", "I", "F"
+        ] = "RGB",
+        sources: list[Literal["upload", "webcam", "clipboard"]] | None = [
+            "upload",
+            "webcam",
+            "clipboard",
+        ],
+        image_type: Literal["numpy", "pil", "filepath"] = "numpy",
+        label: str | None = None,
+        container: bool = True,
+        scale: int | None = None,
+        min_width: int = 160,
+        interactive: bool | None = True,
+        visible: bool = True,
+        elem_id: str | None = None,
+        elem_classes: list[str] | str | None = None,
+        render: bool = True,
+        show_label: bool | None = None,
+        show_download_button: bool = True,
+        show_share_button: bool | None = None,
+        show_clear_button: bool | None = True,
+        show_remove_button: bool | None = None,
+        handles_cursor: bool | None = True,
+        use_default_label: bool | None = False,
+        enable_keyboard_shortcuts: bool = True, 
+    ):
+        """
+        Parameters:
+            value: A dict or None. The dictionary must contain a key 'image' with either an URL to an image, a numpy image or a PIL image. Optionally it may contain a key 'boxes' with a list of boxes. Each box must be a dict wit the keys: 'xmin', 'ymin', 'xmax' and 'ymax' with the absolute image coordinates of the box. Optionally can also include the keys 'label' and 'color' describing the label and color of the box. Color must be a tuple of RGB values (e.g. `(255,255,255)`). Optionally can also include the keys 'orientation' with a integer between 0 and 3, describing the number of times the image is rotated by 90 degrees in frontend, the rotation is clockwise.
+            boxes_alpha: Opacity of the bounding boxes 0 and 1.
+            label_list: List of valid labels.
+            label_colors: Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).
+            box_min_size: Minimum valid bounding box size.
+            handle_size: Size of the bounding box resize handles.
+            box_thickness: Thickness of the bounding box outline.
+            box_selected_thickness: Thickness of the bounding box outline when it is selected.
+            disable_edit_boxes: Disables the ability to set and edit the label and color of the boxes.
+            single_box: If True, at most one box can be drawn.
+            height: The height of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.
+            width: The width of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.
+            image_mode: "RGB" if color, or "L" if black and white. See https://pillow.readthedocs.io/en/stable/handbook/concepts.html for other supported image modes and their meaning.
+            sources: List of sources for the image. "upload" creates a box where user can drop an image file, "webcam" allows user to take snapshot from their webcam, "clipboard" allows users to paste an image from the clipboard. If None, defaults to ["upload", "webcam", "clipboard"].
+            image_type: The format the image is converted before being passed into the prediction function. "numpy" converts the image to a numpy array with shape (height, width, 3) and values from 0 to 255, "pil" converts the image to a PIL image object, "filepath" passes a str path to a temporary file containing the image. If the image is SVG, the `type` is ignored and the filepath of the SVG is returned.
+            label: The label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.
+            container: If True, will place the component in a container - providing some extra padding around the border.
+            scale: relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.
+            min_width: minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.
+            interactive: if True, will allow users to upload and annotate an image; if False, can only be used to display annotated images.
+            visible: If False, component will be hidden.
+            elem_id: An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.
+            elem_classes: An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.
+            render: If False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.
+            show_label: if True, will display label.
+            show_download_button: If True, will show a button to download the image.
+            show_share_button: If True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.
+            show_clear_button: If True, will show a button to clear the current image.
+            show_remove_button: If True, will show a button to remove the selected bounding box.
+            handles_cursor: If True, the cursor will change when hovering over box handles in drag mode. Can be CPU-intensive.
+            use_default_label: If True, the first item in label_list will be used as the default label when creating boxes.
+            enable_keyboard_shortcuts: If True, the component will respond to keyboard events.
+        """
+
+        valid_types = ["numpy", "pil", "filepath"]
+        if image_type not in valid_types:
+            raise ValueError(
+                f"Invalid value for parameter `type`: {type}. Please choose from one of: {valid_types}"
+            )
+        self.image_type = image_type
+        self.height = height
+        self.width = width
+        self.image_mode = image_mode
+        
+        self.sources = sources
+        valid_sources = ["upload", "clipboard", "webcam", None]
+        if isinstance(sources, str):
+            self.sources = [sources]
+        if self.sources is None:
+            self.sources = []
+        if self.sources is not None:
+            for source in self.sources:
+                if source not in valid_sources:
+                    raise ValueError(
+                        f"`sources` must a list consisting of elements in {valid_sources}"
+                    )
+        
+        self.show_download_button = show_download_button
+        self.show_share_button = (
+            (utils.get_space() is not None)
+            if show_share_button is None
+            else show_share_button
+        )
+        self.show_clear_button = show_clear_button
+        self.show_remove_button = show_remove_button
+        self.handles_cursor = handles_cursor
+        self.use_default_label = use_default_label
+        self.enable_keyboard_shortcuts = enable_keyboard_shortcuts
+
+        self.boxes_alpha = boxes_alpha
+        self.box_min_size = box_min_size
+        self.handle_size = handle_size
+        self.box_thickness = box_thickness
+        self.box_selected_thickness = box_selected_thickness
+        self.disable_edit_boxes = disable_edit_boxes
+        self.single_box = single_box
+        if label_list:
+            self.label_list = [(l, i) for i, l in enumerate(label_list)]
+        else:
+            self.label_list = None
+        
+        # Parse colors
+        self.label_colors = label_colors
+        if self.label_colors:
+            if (not isinstance(self.label_colors, list)
+                or self.label_list is None
+                or len(self.label_colors) != len(self.label_list)):
+                raise ValueError("``label_colors`` must be a list with the "
+                                 "same length as ``label_list``")
+            for i, color in enumerate(self.label_colors):
+                if isinstance(color, str):
+                    if len(color) != 7 or color[0] != "#":
+                        raise ValueError(f"Invalid color value {color}")
+                elif isinstance(color, (list, tuple)):
+                    self.label_colors[i] = rgb2hex(*color)
+
+        super().__init__(
+            label=label,
+            every=None,
+            show_label=show_label,
+            container=container,
+            scale=scale,
+            min_width=min_width,
+            interactive=interactive,
+            visible=visible,
+            elem_id=elem_id,
+            elem_classes=elem_classes,
+            render=render,
+            value=value,
+        )
+
+    def preprocess_image(self, image: FileData | None) -> str | None:
+        if image is None:
+            return None
+        file_path = Path(image.path)
+        if image.orig_name:
+            p = Path(image.orig_name)
+            name = p.stem
+            suffix = p.suffix.replace(".", "")
+            if suffix in ["jpg", "jpeg"]:
+                suffix = "jpeg"
+        else:
+            name = "image"
+            suffix = "png"
+
+        if suffix.lower() == "svg":
+            return str(file_path)
+        
+        im = PIL.Image.open(file_path)
+        exif = im.getexif()
+        # 274 is the code for image rotation and 1 means "correct orientation"
+        if exif.get(274, 1) != 1 and hasattr(ImageOps, "exif_transpose"):
+            try:
+                im = ImageOps.exif_transpose(im)
+            except Exception:
+                warnings.warn(
+                    f"Failed to transpose image {file_path} based on EXIF data."
+                )
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            im = im.convert(self.image_mode)
+        return image_utils.format_image(
+            im,
+            cast(Literal["numpy", "pil", "filepath"], self.image_type),
+            self.GRADIO_CACHE,
+            name=name,
+            format=suffix,
+        )
+
+    def preprocess_boxes(self, boxes: List[dict] | None) -> list:
+        parsed_boxes = []
+        for box in boxes:
+            new_box = {}
+            new_box["label"] = box.get("label", "")
+            new_box["color"] = (0,0,0)
+            if "color" in box:
+                match = re.match(r'rgb\((\d+), (\d+), (\d+)\)', box["color"])
+                if match:
+                    new_box["color"] = tuple(int(match.group(i)) for i in range(1, 4))
+            scale_factor = box.get("scaleFactor", 1)
+            new_box["xmin"] = round(box["xmin"] / scale_factor)
+            new_box["ymin"] = round(box["ymin"] / scale_factor)
+            new_box["xmax"] = round(box["xmax"] / scale_factor)
+            new_box["ymax"] = round(box["ymax"] / scale_factor)
+            parsed_boxes.append(new_box)
+        return parsed_boxes
+
+    def preprocess(self, payload: AnnotatedImageData | None) -> AnnotatedImageValue | None:
+        """
+        Parameters:
+            payload: an AnnotatedImageData object.
+        Returns:
+            A dict with the image and boxes or None.
+        """
+        if payload is None:
+            return None
+        
+        ret_value = {
+            "image": self.preprocess_image(payload.image),
+            "boxes": self.preprocess_boxes(payload.boxes),
+            "orientation": payload.orientation,
+        }
+        return ret_value
+
+    def postprocess(self, value: AnnotatedImageValue | None) -> AnnotatedImageData | None:
+        """
+        Parameters:
+            value: A dict with an image and an optional list of boxes or None.
+        Returns:
+            Returns an AnnotatedImageData object.
+        """
+        # Check value
+        if value is None:
+            return None
+        if not isinstance(value, dict):
+            raise ValueError(f"``value`` must be a dict. Got {type(value)}")
+    
+        # Check and get boxes
+        boxes = value.setdefault("boxes", [])
+        if boxes:
+            if not isinstance(value["boxes"], (list, tuple)):
+                raise ValueError(f"'boxes' must be a list of dicts. Got "
+                                 f"{type(value['boxes'])}")
+            for box in value["boxes"]:
+                if (not isinstance(box, dict)
+                    or not set(box.keys()).issubset({"label", "xmin", "ymin", "xmax", "ymax", "color"})
+                    or not set(box.keys()).issuperset({"xmin", "ymin", "xmax", "ymax"})
+                    ):
+                    raise ValueError("Box must be a dict with the following "
+                                     "keys: 'xmin', 'ymin', 'xmax', 'ymax', "
+                                     f"['label', 'color']'. Got {box}")
+
+        # Check and parse image
+        image = value.setdefault("image", None)
+        if image is not None:
+            if isinstance(image, str) and image.lower().endswith(".svg"):
+                image = FileData(path=image, orig_name=Path(image).name)
+            else:
+                saved = image_utils.save_image(image, self.GRADIO_CACHE)
+                orig_name = Path(saved).name if Path(saved).exists() else None
+                image = FileData(path=saved, orig_name=orig_name)
+        else:
+            raise ValueError(f"An image must be provided. Got {value}")
+        
+        orientation = value.setdefault("orientation", 0)
+        if orientation is None:
+            orientation = 0
+
+        return AnnotatedImageData(image=image, boxes=boxes, orientation=orientation)
+
+    def process_example(self, value: dict | None) -> FileData | None:
+        if value is None:
+            return None
+        if not isinstance(value, dict):
+            raise ValueError(f"``value`` must be a dict. Got {type(value)}")
+
+        image = value.setdefault("image", None)
+        if image is not None:
+            if isinstance(image, str) and image.lower().endswith(".svg"):
+                image = FileData(path=image, orig_name=Path(image).name)
+            else:
+                saved = image_utils.save_image(image, self.GRADIO_CACHE)
+                orig_name = Path(saved).name if Path(saved).exists() else None
+                image = FileData(path=saved, orig_name=orig_name)
+        else:
+            raise ValueError(f"An image must be provided. Got {value}")
+
+        return image
+
+    def example_inputs(self) -> Any:
+        return {
+            "image": "https://raw.githubusercontent.com/gradio-app/gradio/main/guides/assets/logo.png",
+            "boxes": [
+                {
+                    "xmin": 30,
+                    "ymin": 70,
+                    "xmax": 530,
+                    "ymax": 500,
+                    "label": "Gradio",
+                    "color": (250,185,0),
+                }
+            ]
+        }

src/demo/app.py

@@ -1,109 +1,109 @@
-import gradio as gr
-from gradio_image_annotation import image_annotator
-import numpy as np
-
-
-example_annotation = {
-    "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
-    "boxes": [
-        {
-            "xmin": 636,
-            "ymin": 575,
-            "xmax": 801,
-            "ymax": 697,
-            "label": "Vehicle",
-            "color": (255, 0, 0)
-        },
-        {
-            "xmin": 360,
-            "ymin": 615,
-            "xmax": 386,
-            "ymax": 702,
-            "label": "Person",
-            "color": (0, 255, 0)
-        }
-    ]
-}
-
-examples_crop = [
-    {
-        "image": "https://raw.githubusercontent.com/gradio-app/gradio/main/guides/assets/logo.png",
-        "boxes": [
-            {
-                "xmin": 30,
-                "ymin": 70,
-                "xmax": 530,
-                "ymax": 500,
-                "color": (100, 200, 255),
-            }
-        ],
-    },
-    {
-        "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
-        "boxes": [
-            {
-                "xmin": 636,
-                "ymin": 575,
-                "xmax": 801,
-                "ymax": 697,
-                "color": (255, 0, 0),
-            },
-        ],
-    },
-]
-
-
-def crop(annotations):
-    if angle := annotations.get("orientation", None):
-        annotations["image"] = np.rot90(annotations["image"], k=-angle)
-    if annotations["boxes"]:
-        box = annotations["boxes"][0]
-        return annotations["image"][
-            box["ymin"]:box["ymax"],
-            box["xmin"]:box["xmax"]
-        ]
-    return None
-
-
-def get_boxes_json(annotations):
-    return annotations["boxes"]
-
-
-with gr.Blocks() as demo:
-    with gr.Tab("Object annotation", id="tab_object_annotation"):
-        annotator = image_annotator(
-            example_annotation,
-            label_list=["Person", "Vehicle"],
-            label_colors=[(0, 255, 0), (255, 0, 0)],
-        )
-        button_get = gr.Button("Get bounding boxes")
-        json_boxes = gr.JSON()
-        button_get.click(get_boxes_json, annotator, json_boxes)
-
-    with gr.Tab("Crop", id="tab_crop"):
-        with gr.Row():
-            annotator_crop = image_annotator(
-                examples_crop[0],
-                image_type="numpy",
-                disable_edit_boxes=True,
-                single_box=True,
-            )
-            image_crop = gr.Image()
-        button_crop = gr.Button("Crop")
-        button_crop.click(crop, annotator_crop, image_crop)
-
-        gr.Examples(examples_crop, annotator_crop)
-
-    with gr.Accordion("Keyboard Shortcuts"):
-        gr.Markdown("""
-        - ``C``: Create mode
-        - ``D``: Drag mode
-        - ``E``: Edit selected box (same as double-click a box)
-        - ``Delete``: Remove selected box
-        - ``Space``: Reset view (zoom/pan)
-        - ``Enter``: Confirm modal dialog
-        - ``Escape``: Cancel/close modal dialog
-        """)
-
-if __name__ == "__main__":
-    demo.launch()
+import gradio as gr
+from gradio_image_annotation import image_annotator
+import numpy as np
+
+
+example_annotation = {
+    "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
+    "boxes": [
+        {
+            "xmin": 636,
+            "ymin": 575,
+            "xmax": 801,
+            "ymax": 697,
+            "label": "Vehicle",
+            "color": (255, 0, 0)
+        },
+        {
+            "xmin": 360,
+            "ymin": 615,
+            "xmax": 386,
+            "ymax": 702,
+            "label": "Person",
+            "color": (0, 255, 0)
+        }
+    ]
+}
+
+examples_crop = [
+    {
+        "image": "https://raw.githubusercontent.com/gradio-app/gradio/main/guides/assets/logo.png",
+        "boxes": [
+            {
+                "xmin": 30,
+                "ymin": 70,
+                "xmax": 530,
+                "ymax": 500,
+                "color": (100, 200, 255),
+            }
+        ],
+    },
+    {
+        "image": "https://gradio-builds.s3.amazonaws.com/demo-files/base.png",
+        "boxes": [
+            {
+                "xmin": 636,
+                "ymin": 575,
+                "xmax": 801,
+                "ymax": 697,
+                "color": (255, 0, 0),
+            },
+        ],
+    },
+]
+
+
+def crop(annotations):
+    if angle := annotations.get("orientation", None):
+        annotations["image"] = np.rot90(annotations["image"], k=-angle)
+    if annotations["boxes"]:
+        box = annotations["boxes"][0]
+        return annotations["image"][
+            box["ymin"]:box["ymax"],
+            box["xmin"]:box["xmax"]
+        ]
+    return None
+
+
+def get_boxes_json(annotations):
+    return annotations["boxes"]
+
+
+with gr.Blocks() as demo:
+    with gr.Tab("Object annotation", id="tab_object_annotation"):
+        annotator = image_annotator(
+            example_annotation,
+            label_list=["Person", "Vehicle"],
+            label_colors=[(0, 255, 0), (255, 0, 0)],
+        )
+        button_get = gr.Button("Get bounding boxes")
+        json_boxes = gr.JSON()
+        button_get.click(get_boxes_json, annotator, json_boxes)
+
+    with gr.Tab("Crop", id="tab_crop"):
+        with gr.Row():
+            annotator_crop = image_annotator(
+                examples_crop[0],
+                image_type="numpy",
+                disable_edit_boxes=True,
+                single_box=True,
+            )
+            image_crop = gr.Image()
+        button_crop = gr.Button("Crop")
+        button_crop.click(crop, annotator_crop, image_crop)
+
+        gr.Examples(examples_crop, annotator_crop)
+
+    with gr.Accordion("Keyboard Shortcuts"):
+        gr.Markdown("""
+        - ``C``: Create mode
+        - ``D``: Drag mode
+        - ``E``: Edit selected box (same as double-click a box)
+        - ``Delete``: Remove selected box
+        - ``Space``: Reset view (zoom/pan)
+        - ``Enter``: Confirm modal dialog
+        - ``Escape``: Cancel/close modal dialog
+        """)
+
+if __name__ == "__main__":
+    demo.launch()

src/demo/space.py

@@ -3,7 +3,7 @@ import gradio as gr
 from app import demo as app
 import os
 
-_docs = {'image_annotator': {'description': 'Creates a component to annotate images with bounding boxes. The bounding boxes can be created and edited by the user or be passed by code.\nIt is also possible to predefine a set of valid classes and colors.', 'members': {'__init__': {'value': {'type': 'dict | None', 'default': 'None', 'description': "A dict or None. The dictionary must contain a key 'image' with either an URL to an image, a numpy image or a PIL image. Optionally it may contain a key 'boxes' with a list of boxes. Each box must be a dict wit the keys: 'xmin', 'ymin', 'xmax' and 'ymax' with the absolute image coordinates of the box. Optionally can also include the keys 'label' and 'color' describing the label and color of the box. Color must be a tuple of RGB values (e.g. `(255,255,255)`). Optionally can also include the keys 'orientation' with a integer between 0 and 3, describing the number of times the image is rotated by 90 degrees in frontend, the rotation is clockwise."}, 'boxes_alpha': {'type': 'float | None', 'default': 'None', 'description': 'Opacity of the bounding boxes 0 and 1.'}, 'label_list': {'type': 'list[str] | None', 'default': 'None', 'description': 'List of valid labels.'}, 'label_colors': {'type': 'list[str] | None', 'default': 'None', 'description': 'Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).'}, 'box_min_size': {'type': 'int | None', 'default': 'None', 'description': 'Minimum valid bounding box size.'}, 'handle_size': {'type': 'int | None', 'default': 'None', 'description': 'Size of the bounding box resize handles.'}, 'box_thickness': {'type': 'int | None', 'default': 'None', 'description': 'Thickness of the bounding box outline.'}, 'box_selected_thickness': {'type': 'int | None', 'default': 'None', 'description': 'Thickness of the bounding box outline when it is selected.'}, 'disable_edit_boxes': {'type': 'bool | None', 'default': 'None', 'description': 'Disables the ability to set and edit the label and color of the boxes.'}, 'single_box': {'type': 'bool', 'default': 'False', 'description': 'If True, at most one box can be drawn.'}, 'height': {'type': 'int | str | None', 'default': 'None', 'description': 'The height of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'width': {'type': 'int | str | None', 'default': 'None', 'description': 'The width of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'image_mode': {'type': '"1"\n    | "L"\n    | "P"\n    | "RGB"\n    | "RGBA"\n    | "CMYK"\n    | "YCbCr"\n    | "LAB"\n    | "HSV"\n    | "I"\n    | "F"', 'default': '"RGB"', 'description': '"RGB" if color, or "L" if black and white. See https://pillow.readthedocs.io/en/stable/handbook/concepts.html for other supported image modes and their meaning.'}, 'sources': {'type': 'list["upload" | "webcam" | "clipboard"] | None', 'default': '["upload", "webcam", "clipboard"]', 'description': 'List of sources for the image. "upload" creates a box where user can drop an image file, "webcam" allows user to take snapshot from their webcam, "clipboard" allows users to paste an image from the clipboard. If None, defaults to ["upload", "webcam", "clipboard"].'}, 'image_type': {'type': '"numpy" | "pil" | "filepath"', 'default': '"numpy"', 'description': 'The format the image is converted before being passed into the prediction function. "numpy" converts the image to a numpy array with shape (height, width, 3) and values from 0 to 255, "pil" converts the image to a PIL image object, "filepath" passes a str path to a temporary file containing the image. If the image is SVG, the `type` is ignored and the filepath of the SVG is returned.'}, 'label': {'type': 'str | None', 'default': 'None', 'description': 'The label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.'}, 'container': {'type': 'bool', 'default': 'True', 'description': 'If True, will place the component in a container - providing some extra padding around the border.'}, 'scale': {'type': 'int | None', 'default': 'None', 'description': 'relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.'}, 'min_width': {'type': 'int', 'default': '160', 'description': 'minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.'}, 'interactive': {'type': 'bool | None', 'default': 'True', 'description': 'if True, will allow users to upload and annotate an image; if False, can only be used to display annotated images.'}, 'visible': {'type': 'bool', 'default': 'True', 'description': 'If False, component will be hidden.'}, 'elem_id': {'type': 'str | None', 'default': 'None', 'description': 'An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'elem_classes': {'type': 'list[str] | str | None', 'default': 'None', 'description': 'An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'render': {'type': 'bool', 'default': 'True', 'description': 'If False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.'}, 'show_label': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will display label.'}, 'show_download_button': {'type': 'bool', 'default': 'True', 'description': 'If True, will show a button to download the image.'}, 'show_share_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.'}, 'show_clear_button': {'type': 'bool | None', 'default': 'True', 'description': 'If True, will show a button to clear the current image.'}, 'show_remove_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a button to remove the selected bounding box.'}, 'handles_cursor': {'type': 'bool | None', 'default': 'True', 'description': 'If True, the cursor will change when hovering over box handles in drag mode. Can be CPU-intensive.'}, 'use_default_label': {'type': 'bool | None', 'default': 'False', 'description': 'If True, the first item in label_list will be used as the default label when creating boxes.'}, 'enable_keyboard_shortcuts': {'type': 'bool', 'default': 'True', 'description': 'If True, the component will respond to keyboard events.'}}, 'postprocess': {'value': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with an image and an optional list of boxes or None.'}}, 'preprocess': {'return': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with the image and boxes or None.'}, 'value': None}}, 'events': {'clear': {'type': None, 'default': None, 'description': 'This listener is triggered when the user clears the image_annotator using the clear button for the component.'}, 'change': {'type': None, 'default': None, 'description': 'Triggered when the value of the image_annotator changes either because of user input (e.g. a user types in a textbox) OR because of a function update (e.g. an image receives a value from the output of an event trigger). See `.input()` for a listener that is only triggered by user input.'}, 'upload': {'type': None, 'default': None, 'description': 'This listener is triggered when the user uploads a file into the image_annotator.'}}}, '__meta__': {'additional_interfaces': {'AnnotatedImageValue': {'source': 'class AnnotatedImageValue(TypedDict):\n    image: Optional[np.ndarray | PIL.Image.Image | str]\n    boxes: Optional[List[dict]]\n    orientation: Optional[int]'}}, 'user_fn_refs': {'image_annotator': ['AnnotatedImageValue']}}}
+_docs = {'image_annotator': {'description': 'Creates a component to annotate images with bounding boxes. The bounding boxes can be created and edited by the user or be passed by code.\nIt is also possible to predefine a set of valid classes and colors.', 'members': {'__init__': {'value': {'type': 'dict | None', 'default': 'None', 'description': "A dict or None. The dictionary must contain a key 'image' with either an URL to an image, a numpy image or a PIL image. Optionally it may contain a key 'boxes' with a list of boxes. Each box must be a dict wit the keys: 'xmin', 'ymin', 'xmax' and 'ymax' with the absolute image coordinates of the box. Optionally can also include the keys 'label' and 'color' describing the label and color of the box. Color must be a tuple of RGB values (e.g. `(255,255,255)`). Optionally can also include the keys 'orientation' with a integer between 0 and 3, describing the number of times the image is rotated by 90 degrees in frontend, the rotation is clockwise."}, 'boxes_alpha': {'type': 'float', 'default': '0.5', 'description': 'Opacity of the bounding boxes 0 and 1.'}, 'label_list': {'type': 'list[str]', 'default': '[]', 'description': 'List of valid labels.'}, 'label_colors': {'type': 'list[str]', 'default': '[]', 'description': 'Optional list of colors for each label when `label_list` is used. Colors must be a tuple of RGB values (e.g. `(255,255,255)`).'}, 'box_min_size': {'type': 'int', 'default': '10', 'description': 'Minimum valid bounding box size.'}, 'handle_size': {'type': 'int', 'default': '8', 'description': 'Size of the bounding box resize handles.'}, 'box_thickness': {'type': 'int', 'default': '2', 'description': 'Thickness of the bounding box outline.'}, 'box_selected_thickness': {'type': 'int', 'default': '4', 'description': 'Thickness of the bounding box outline when it is selected.'}, 'disable_edit_boxes': {'type': 'bool | None', 'default': 'None', 'description': 'Disables the ability to set and edit the label and color of the boxes.'}, 'single_box': {'type': 'bool', 'default': 'False', 'description': 'If True, at most one box can be drawn.'}, 'height': {'type': 'int | str | None', 'default': 'None', 'description': 'The height of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'width': {'type': 'int | str | None', 'default': 'None', 'description': 'The width of the displayed image, specified in pixels if a number is passed, or in CSS units if a string is passed.'}, 'image_mode': {'type': '"1"\n    | "L"\n    | "P"\n    | "RGB"\n    | "RGBA"\n    | "CMYK"\n    | "YCbCr"\n    | "LAB"\n    | "HSV"\n    | "I"\n    | "F"', 'default': '"RGB"', 'description': '"RGB" if color, or "L" if black and white. See https://pillow.readthedocs.io/en/stable/handbook/concepts.html for other supported image modes and their meaning.'}, 'sources': {'type': 'list["upload" | "webcam" | "clipboard"] | None', 'default': '["upload", "webcam", "clipboard"]', 'description': 'List of sources for the image. "upload" creates a box where user can drop an image file, "webcam" allows user to take snapshot from their webcam, "clipboard" allows users to paste an image from the clipboard. If None, defaults to ["upload", "webcam", "clipboard"].'}, 'image_type': {'type': '"numpy" | "pil" | "filepath"', 'default': '"numpy"', 'description': 'The format the image is converted before being passed into the prediction function. "numpy" converts the image to a numpy array with shape (height, width, 3) and values from 0 to 255, "pil" converts the image to a PIL image object, "filepath" passes a str path to a temporary file containing the image. If the image is SVG, the `type` is ignored and the filepath of the SVG is returned.'}, 'label': {'type': 'str | None', 'default': 'None', 'description': 'The label for this component. Appears above the component and is also used as the header if there are a table of examples for this component. If None and used in a `gr.Interface`, the label will be the name of the parameter this component is assigned to.'}, 'container': {'type': 'bool', 'default': 'True', 'description': 'If True, will place the component in a container - providing some extra padding around the border.'}, 'scale': {'type': 'int | None', 'default': 'None', 'description': 'relative size compared to adjacent Components. For example if Components A and B are in a Row, and A has scale=2, and B has scale=1, A will be twice as wide as B. Should be an integer. scale applies in Rows, and to top-level Components in Blocks where fill_height=True.'}, 'min_width': {'type': 'int', 'default': '160', 'description': 'minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.'}, 'interactive': {'type': 'bool | None', 'default': 'True', 'description': 'if True, will allow users to upload and annotate an image; if False, can only be used to display annotated images.'}, 'visible': {'type': 'bool', 'default': 'True', 'description': 'If False, component will be hidden.'}, 'elem_id': {'type': 'str | None', 'default': 'None', 'description': 'An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'elem_classes': {'type': 'list[str] | str | None', 'default': 'None', 'description': 'An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.'}, 'render': {'type': 'bool', 'default': 'True', 'description': 'If False, component will not render be rendered in the Blocks context. Should be used if the intention is to assign event listeners now but render the component later.'}, 'show_label': {'type': 'bool | None', 'default': 'None', 'description': 'if True, will display label.'}, 'show_download_button': {'type': 'bool', 'default': 'True', 'description': 'If True, will show a button to download the image.'}, 'show_share_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a share icon in the corner of the component that allows user to share outputs to Hugging Face Spaces Discussions. If False, icon does not appear. If set to None (default behavior), then the icon appears if this Gradio app is launched on Spaces, but not otherwise.'}, 'show_clear_button': {'type': 'bool | None', 'default': 'True', 'description': 'If True, will show a button to clear the current image.'}, 'show_remove_button': {'type': 'bool | None', 'default': 'None', 'description': 'If True, will show a button to remove the selected bounding box.'}, 'handles_cursor': {'type': 'bool | None', 'default': 'True', 'description': 'If True, the cursor will change when hovering over box handles in drag mode. Can be CPU-intensive.'}, 'use_default_label': {'type': 'bool | None', 'default': 'False', 'description': 'If True, the first item in label_list will be used as the default label when creating boxes.'}, 'enable_keyboard_shortcuts': {'type': 'bool', 'default': 'True', 'description': 'If True, the component will respond to keyboard events.'}}, 'postprocess': {'value': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with an image and an optional list of boxes or None.'}}, 'preprocess': {'return': {'type': 'AnnotatedImageValue | None', 'description': 'A dict with the image and boxes or None.'}, 'value': None}}, 'events': {'clear': {'type': None, 'default': None, 'description': 'This listener is triggered when the user clears the image_annotator using the clear button for the component.'}, 'change': {'type': None, 'default': None, 'description': 'Triggered when the value of the image_annotator changes either because of user input (e.g. a user types in a textbox) OR because of a function update (e.g. an image receives a value from the output of an event trigger). See `.input()` for a listener that is only triggered by user input.'}, 'upload': {'type': None, 'default': None, 'description': 'This listener is triggered when the user uploads a file into the image_annotator.'}}}, '__meta__': {'additional_interfaces': {'AnnotatedImageValue': {'source': 'class AnnotatedImageValue(TypedDict):\n    image: Optional[np.ndarray | PIL.Image.Image | str]\n    boxes: Optional[List[dict]]\n    orientation: Optional[int]'}}, 'user_fn_refs': {'image_annotator': ['AnnotatedImageValue']}}}
 
 abs_path = os.path.join(os.path.dirname(__file__), "css.css")
 
@@ -133,7 +133,7 @@ with gr.Blocks() as demo:
         button_crop.click(crop, annotator_crop, image_crop)
 
         gr.Examples(examples_crop, annotator_crop)
-    
+
     with gr.Accordion("Keyboard Shortcuts"):
         gr.Markdown(\"\"\"
         - ``C``: Create mode

src/frontend/Example.svelte

@@ -1,48 +1,48 @@
-<script lang="ts">
-	import type { FileData } from "@gradio/client";
-
-	export let value: null | FileData;
-	export let type: "gallery" | "table";
-	export let selected = false;
-</script>
-
-<div
-	class="container"
-	class:table={type === "table"}
-	class:gallery={type === "gallery"}
-	class:selected
-	class:border={value}
->
-	{#if value}
-		<img src={value.url} alt="" />
-	{/if}
-</div>
-
-<style>
-	.container :global(img) {
-		width: 100%;
-		height: 100%;
-	}
-
-	.container.selected {
-		border-color: var(--border-color-accent);
-	}
-	.border.table {
-		border: 2px solid var(--border-color-primary);
-	}
-
-	.container.table {
-		margin: 0 auto;
-		border-radius: var(--radius-lg);
-		overflow: hidden;
-		width: var(--size-20);
-		height: var(--size-20);
-		object-fit: cover;
-	}
-
-	.container.gallery {
-		width: var(--size-20);
-		max-width: var(--size-20);
-		object-fit: cover;
-	}
-</style>
+<script lang="ts">
+	import type { FileData } from "@gradio/client";
+
+	export let value: null | FileData;
+	export let type: "gallery" | "table";
+	export let selected = false;
+</script>
+
+<div
+	class="container"
+	class:table={type === "table"}
+	class:gallery={type === "gallery"}
+	class:selected
+	class:border={value}
+>
+	{#if value}
+		<img src={value.url} alt="" />
+	{/if}
+</div>
+
+<style>
+	.container :global(img) {
+		width: 100%;
+		height: 100%;
+	}
+
+	.container.selected {
+		border-color: var(--border-color-accent);
+	}
+	.border.table {
+		border: 2px solid var(--border-color-primary);
+	}
+
+	.container.table {
+		margin: 0 auto;
+		border-radius: var(--radius-lg);
+		overflow: hidden;
+		width: var(--size-20);
+		height: var(--size-20);
+		object-fit: cover;
+	}
+
+	.container.gallery {
+		width: var(--size-20);
+		max-width: var(--size-20);
+		object-fit: cover;
+	}
+</style>

src/frontend/Index.svelte

@@ -1,143 +1,143 @@
-<svelte:options accessors={true} />
-
-<script context="module" lang="ts">
-	export { default as BaseExample } from "./Example.svelte";
-</script>
-
-<script lang="ts">
-	import type { Gradio, SelectData } from "@gradio/utils";
-	import { Block, Empty, UploadText } from "@gradio/atoms";
-	import { Image } from "@gradio/icons";
-	import { StatusTracker } from "@gradio/statustracker";
-	import type { LoadingStatus } from "@gradio/statustracker";
-	import AnnotatedImageData from "./shared/AnnotatedImageData";
-	import ImageAnnotator from "./shared/ImageAnnotator.svelte";
-
-	type sources = "upload" | "webcam" | "clipboard" | null;
-
-	export let elem_id = "";
-	export let elem_classes: string[] = [];
-	export let visible = true;
-	export let value: null | AnnotatedImageData = null;
-	export let label: string;
-	export let show_label: boolean;
-	export let root: string;
-	export let height: number | string | undefined;
-	export let width: number | string | undefined;
-	export let _selectable = false;
-	export let container = true;
-	export let scale: number | null = null;
-	export let min_width: number | undefined = undefined;
-	export let loading_status: LoadingStatus;
-	export let sources: ("upload" | "webcam" | "clipboard")[] = [
-		"upload",
-		"webcam",
-		"clipboard",
-	];
-	export let show_download_button: boolean;
-	export let show_share_button: boolean;
-	export let show_clear_button: boolean;
-	export let interactive: boolean;
-	export let boxes_alpha: number;
-	export let label_list: string[];
-	export let label_colors: string[];
-	export let box_min_size: number;
-	export let handle_size: number;
-	export let box_thickness: number;
-	export let box_selected_thickness: number;
-	export let disable_edit_boxes: boolean;
-	export let single_box: boolean;
-	export let show_remove_button: boolean;
-	export let handles_cursor: boolean;
-	export let use_default_label: boolean;
-	export let enable_keyboard_shortcuts: boolean;
-
-	export let gradio: Gradio<{
-		change: never;
-		error: string;
-		edit: never;
-		drag: never;
-		upload: never;
-		clear: never;
-		select: SelectData;
-		share: ShareData;
-	}>;
-
-	let dragging: boolean;
-	let active_source: sources = null;
-</script>
-
-<Block
-	{visible}
-	variant={"solid"}
-	border_mode={dragging ? "focus" : "base"}
-	padding={false}
-	{elem_id}
-	{elem_classes}
-	{width}
-	allow_overflow={false}
-	{container}
-	{scale}
-	{min_width}
->
-	<StatusTracker
-		autoscroll={gradio.autoscroll}
-		i18n={gradio.i18n}
-		{...loading_status}
-	/>
-
-	<ImageAnnotator
-		bind:active_source
-		bind:value
-		on:change={() => gradio.dispatch("change")}
-		selectable={_selectable}
-		{root}
-		{sources}
-		{interactive}
-		showDownloadButton={show_download_button}
-		showShareButton={show_share_button}
-		showClearButton={show_clear_button}
-		i18n={gradio.i18n}
-		boxesAlpha={boxes_alpha}
-		height={height}
-		width={width}
-		labelList={label_list}
-		labelColors={label_colors}
-		boxMinSize={box_min_size}
-		on:edit={() => gradio.dispatch("edit")}
-		on:clear={() => {
-			gradio.dispatch("clear");
-		}}
-		on:drag={({ detail }) => (dragging = detail)}
-		on:upload={() => gradio.dispatch("upload")}
-		on:select={({ detail }) => gradio.dispatch("select", detail)}
-		on:share={({ detail }) => gradio.dispatch("share", detail)}
-		on:error={({ detail }) => {
-			loading_status = loading_status || {};
-			loading_status.status = "error";
-			gradio.dispatch("error", detail);
-		}}
-		{label}
-		{show_label}
-		max_file_size={gradio.max_file_size}
-		cli_upload={gradio.client.upload}
-		stream_handler={gradio.client.stream}
-		handleSize={handle_size}
-		boxThickness={box_thickness}
-		boxSelectedThickness={box_selected_thickness}
-		disableEditBoxes={disable_edit_boxes}
-		singleBox={single_box}
-		showRemoveButton={show_remove_button}
-		handlesCursor={handles_cursor}
-		useDefaultLabel={use_default_label}
-		enableKeyboardShortcuts={enable_keyboard_shortcuts}
-	>
-		{#if active_source === "upload"}
-			<UploadText i18n={gradio.i18n} type="image" />
-		{:else if active_source === "clipboard"}
-			<UploadText i18n={gradio.i18n} type="clipboard" mode="short" />
-		{:else}
-			<Empty unpadded_box={true} size="large"><Image /></Empty>
-		{/if}
-	</ImageAnnotator>
-</Block>
+<svelte:options accessors={true} />
+
+<script context="module" lang="ts">
+	export { default as BaseExample } from "./Example.svelte";
+</script>
+
+<script lang="ts">
+	import type { Gradio, SelectData } from "@gradio/utils";
+	import { Block, Empty, UploadText } from "@gradio/atoms";
+	import { Image } from "@gradio/icons";
+	import { StatusTracker } from "@gradio/statustracker";
+	import type { LoadingStatus } from "@gradio/statustracker";
+	import AnnotatedImageData from "./shared/AnnotatedImageData";
+	import ImageAnnotator from "./shared/ImageAnnotator.svelte";
+
+	type sources = "upload" | "webcam" | "clipboard" | null;
+
+	export let elem_id = "";
+	export let elem_classes: string[] = [];
+	export let visible = true;
+	export let value: null | AnnotatedImageData = null;
+	export let label: string;
+	export let show_label: boolean;
+	export let root: string;
+	export let height: number | string | undefined;
+	export let width: number | string | undefined;
+	export let _selectable = false;
+	export let container = true;
+	export let scale: number | null = null;
+	export let min_width: number | undefined = undefined;
+	export let loading_status: LoadingStatus;
+	export let sources: ("upload" | "webcam" | "clipboard")[] = [
+		"upload",
+		"webcam",
+		"clipboard",
+	];
+	export let show_download_button: boolean;
+	export let show_share_button: boolean;
+	export let show_clear_button: boolean;
+	export let interactive: boolean;
+	export let boxes_alpha: number;
+	export let label_list: string[];
+	export let label_colors: string[];
+	export let box_min_size: number;
+	export let handle_size: number;
+	export let box_thickness: number;
+	export let box_selected_thickness: number;
+	export let disable_edit_boxes: boolean;
+	export let single_box: boolean;
+	export let show_remove_button: boolean;
+	export let handles_cursor: boolean;
+	export let use_default_label: boolean;
+	export let enable_keyboard_shortcuts: boolean;
+
+	export let gradio: Gradio<{
+		change: never;
+		error: string;
+		edit: never;
+		drag: never;
+		upload: never;
+		clear: never;
+		select: SelectData;
+		share: ShareData;
+	}>;
+
+	let dragging: boolean;
+	let active_source: sources = null;
+</script>
+
+<Block
+	{visible}
+	variant={"solid"}
+	border_mode={dragging ? "focus" : "base"}
+	padding={false}
+	{elem_id}
+	{elem_classes}
+	{width}
+	allow_overflow={false}
+	{container}
+	{scale}
+	{min_width}
+>
+	<StatusTracker
+		autoscroll={gradio.autoscroll}
+		i18n={gradio.i18n}
+		{...loading_status}
+	/>
+
+	<ImageAnnotator
+		bind:active_source
+		bind:value
+		on:change={() => gradio.dispatch("change")}
+		selectable={_selectable}
+		{root}
+		{sources}
+		{interactive}
+		showDownloadButton={show_download_button}
+		showShareButton={show_share_button}
+		showClearButton={show_clear_button}
+		i18n={gradio.i18n}
+		boxesAlpha={boxes_alpha}
+		height={height}
+		width={width}
+		labelList={label_list}
+		labelColors={label_colors}
+		boxMinSize={box_min_size}
+		on:edit={() => gradio.dispatch("edit")}
+		on:clear={() => {
+			gradio.dispatch("clear");
+		}}
+		on:drag={({ detail }) => (dragging = detail)}
+		on:upload={() => gradio.dispatch("upload")}
+		on:select={({ detail }) => gradio.dispatch("select", detail)}
+		on:share={({ detail }) => gradio.dispatch("share", detail)}
+		on:error={({ detail }) => {
+			loading_status = loading_status || {};
+			loading_status.status = "error";
+			gradio.dispatch("error", detail);
+		}}
+		{label}
+		{show_label}
+		max_file_size={gradio.max_file_size}
+		cli_upload={gradio.client.upload}
+		stream_handler={gradio.client.stream}
+		handleSize={handle_size}
+		boxThickness={box_thickness}
+		boxSelectedThickness={box_selected_thickness}
+		disableEditBoxes={disable_edit_boxes}
+		singleBox={single_box}
+		showRemoveButton={show_remove_button}
+		handlesCursor={handles_cursor}
+		useDefaultLabel={use_default_label}
+		enableKeyboardShortcuts={enable_keyboard_shortcuts}
+	>
+		{#if active_source === "upload"}
+			<UploadText i18n={gradio.i18n} type="image" />
+		{:else if active_source === "clipboard"}
+			<UploadText i18n={gradio.i18n} type="clipboard" mode="short" />
+		{:else}
+			<Empty unpadded_box={true} size="large"><Image /></Empty>
+		{/if}
+	</ImageAnnotator>
+</Block>

src/frontend/package.json

@@ -1,35 +1,35 @@
-{
-  "name": "gradio_image_annotator",
-  "version": "0.11.9",
-  "description": "Gradio UI packages",
-  "type": "module",
-  "author": "",
-  "license": "ISC",
-  "private": false,
-  "dependencies": {
-    "@gradio/atoms": "0.7.4",
-    "@gradio/client": "1.1.0",
-    "@gradio/icons": "0.4.1",
-    "@gradio/statustracker": "0.6.0",
-    "@gradio/upload": "0.11.1",
-    "@gradio/image": "0.11.9",
-    "@gradio/utils": "0.4.2",
-    "@gradio/wasm": "0.10.1",
-    "cropperjs": "^1.5.12",
-    "lazy-brush": "^1.0.1",
-    "resize-observer-polyfill": "^1.5.1",
-    "@gradio/colorpicker": "^0.2.11",
-    "@gradio/button": "^0.2.24"
-  },
-  "devDependencies": {
-    "@gradio/preview": "0.9.1"
-  },
-  "main_changeset": true,
-  "main": "./Index.svelte",
-  "exports": {
-    ".": "./Index.svelte",
-    "./shared": "./shared/index.ts",
-    "./example": "./Example.svelte",
-    "./package.json": "./package.json"
-  }
-}
+{
+  "name": "gradio_image_annotator",
+  "version": "0.11.9",
+  "description": "Gradio UI packages",
+  "type": "module",
+  "author": "",
+  "license": "ISC",
+  "private": false,
+  "dependencies": {
+    "@gradio/atoms": "0.7.4",
+    "@gradio/client": "1.1.0",
+    "@gradio/icons": "0.4.1",
+    "@gradio/statustracker": "0.6.0",
+    "@gradio/upload": "0.11.1",
+    "@gradio/image": "0.11.9",
+    "@gradio/utils": "0.4.2",
+    "@gradio/wasm": "0.10.1",
+    "cropperjs": "^1.5.12",
+    "lazy-brush": "^1.0.1",
+    "resize-observer-polyfill": "^1.5.1",
+    "@gradio/colorpicker": "^0.2.11",
+    "@gradio/button": "^0.2.24"
+  },
+  "devDependencies": {
+    "@gradio/preview": "0.9.1"
+  },
+  "main_changeset": true,
+  "main": "./Index.svelte",
+  "exports": {
+    ".": "./Index.svelte",
+    "./shared": "./shared/index.ts",
+    "./example": "./Example.svelte",
+    "./package.json": "./package.json"
+  }
+}

src/frontend/shared/AnnotatedImageData.ts

@@ -1,8 +1,8 @@
-import type { FileData } from "@gradio/client";
-import Box from "./Box";
-
-export default class AnnotatedImageData {
-    image: FileData;
-    boxes: Box[] = [];
-    orientation: number = 0;
-}
+import type { FileData } from "@gradio/client";
+import Box from "./Box";
+
+export default class AnnotatedImageData {
+    image: FileData;
+    boxes: Box[] = [];
+    orientation: number = 0;
+}

src/frontend/shared/Box.ts

@@ -1,567 +1,567 @@
-import WindowViewer from "./WindowViewer";
-const clamp = (num: number, min: number, max: number) => Math.min(Math.max(num, min), max)
-
-
-function setAlpha(rgbColor: string, alpha: number) {
-    if (rgbColor.startsWith('rgba')) {
-        return rgbColor.replace(/[\d.]+$/, alpha.toString());
-    }
-    const matches = rgbColor.match(/\d+/g);
-    if (!matches || matches.length !== 3) {
-        return `rgba(50, 50, 50, ${alpha})`;
-    }
-    const [r, g, b] = matches;
-    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
-}
-
-
-export default class Box {
-    label: string;
-    xmin: number;
-    ymin: number;
-    xmax: number;
-    ymax: number;
-    _xmin: number;
-    _ymin: number;
-    _xmax: number;
-    _ymax: number;
-    color: string;
-    alpha: number;
-    isDragging: boolean;
-    isResizing: boolean;
-    isSelected: boolean;
-    isCreating: boolean;
-    offsetMouseX: number;
-    offsetMouseY: number;
-    resizeHandleSize: number;
-    resizingHandleIndex: number;
-    minSize: number;
-    renderCallBack: () => void;
-    onFinishCreation: () => void;
-    canvasXmin: number;
-    canvasYmin: number;
-    canvasXmax: number;
-    canvasYmax: number;
-    scaleFactor: number;
-    thickness: number;
-    selectedThickness: number;
-    creatingAnchorX: string;
-    creatingAnchorY: string;
-    resizeHandles: {
-        xmin: number;
-        ymin: number;
-        xmax: number;
-        ymax: number;
-        cursor: string;
-    }[];
-    canvasWindow: WindowViewer;
-    pointersCache: Map<number, PointerEvent>;
-
-    constructor(
-        renderCallBack: () => void,
-        onFinishCreation: () => void,
-        canvasWindow: WindowViewer,
-        pointersCache: Map<number, PointerEvent>,
-        canvasXmin: number,
-        canvasYmin: number,
-        canvasXmax: number,
-        canvasYmax: number,
-        label: string,
-        xmin: number,
-        ymin: number,
-        xmax: number,
-        ymax: number,
-        color: string = "rgb(255, 255, 255)",
-        alpha: number = 0.5,
-        minSize: number = 25,
-        handleSize: number = 8,
-        thickness: number = 2,
-        selectedThickness: number = 4,
-        scaleFactor: number = 1,
-    ) {
-        this.renderCallBack = renderCallBack;
-        this.onFinishCreation = onFinishCreation;
-        this.canvasWindow = canvasWindow;
-        this.pointersCache = pointersCache;
-        this.canvasXmin = canvasXmin;
-        this.canvasYmin = canvasYmin;
-        this.canvasXmax = canvasXmax;
-        this.canvasYmax = canvasYmax;
-        this.scaleFactor = scaleFactor;
-        this.label = label;
-        this.isDragging = false;
-        this.isCreating = false;
-        this._xmin = xmin;
-        this._ymin = ymin;
-        this._xmax = xmax;
-        this._ymax = ymax;
-        this.xmin = this._xmin * this.canvasWindow.scale;
-        this.ymin = this._ymin * this.canvasWindow.scale;
-        this.xmax = this._xmax * this.canvasWindow.scale;
-        this.ymax = this._ymax * this.canvasWindow.scale;
-        this.isResizing = false;
-        this.isSelected = false;
-        this.offsetMouseX = 0;
-        this.offsetMouseY = 0;
-        this.resizeHandleSize = handleSize;
-        this.thickness = thickness;
-        this.selectedThickness = selectedThickness;
-        this.updateHandles();
-        this.resizingHandleIndex = -1;
-        this.minSize = minSize;
-        this.color = color;
-        this.alpha = alpha;
-        this.creatingAnchorX = "xmin";
-        this.creatingAnchorY = "ymin";
-    }
-
-    toJSON() {
-        return {
-            label: this.label,
-            xmin: this._xmin,
-            ymin: this._ymin,
-            xmax: this._xmax,
-            ymax: this._ymax,
-            color: this.color,
-            scaleFactor: this.scaleFactor,
-        };
-    }
-
-    setSelected(selected: boolean): void{
-        this.isSelected = selected;
-    }
-
-    setScaleFactor(scaleFactor: number) {
-        let scale = scaleFactor / this.scaleFactor;
-        this._xmin = Math.round(this._xmin * scale);
-        this._ymin = Math.round(this._ymin * scale);
-        this._xmax = Math.round(this._xmax * scale);
-        this._ymax = Math.round(this._ymax * scale);
-        this.applyUserScale();
-        // this.updateHandles();
-        this.scaleFactor = scaleFactor;
-    }
-
-    updateHandles(): void {
-        const halfSize = this.resizeHandleSize / 2;
-        const width = this.getWidth();
-        const height = this.getHeight();
-        this.resizeHandles = [
-            {
-                // Top left
-                xmin: this.xmin - halfSize,
-                ymin: this.ymin - halfSize,
-                xmax: this.xmin + halfSize,
-                ymax: this.ymin + halfSize,
-                cursor: "nwse-resize",
-            },
-            {
-                // Top right
-                xmin: this.xmax - halfSize,
-                ymin: this.ymin - halfSize,
-                xmax: this.xmax + halfSize,
-                ymax: this.ymin + halfSize,
-                cursor: "nesw-resize",
-            },
-            {
-                // Bottom right
-                xmin: this.xmax - halfSize,
-                ymin: this.ymax - halfSize,
-                xmax: this.xmax + halfSize,
-                ymax: this.ymax + halfSize,
-                cursor: "nwse-resize",
-            },
-            {
-                // Bottom left
-                xmin: this.xmin - halfSize,
-                ymin: this.ymax - halfSize,
-                xmax: this.xmin + halfSize,
-                ymax: this.ymax + halfSize,
-                cursor: "nesw-resize",
-            },
-            {
-                // Top center
-                xmin: this.xmin + (width / 2) - halfSize,
-                ymin: this.ymin - halfSize,
-                xmax: this.xmin + (width / 2) + halfSize,
-                ymax: this.ymin + halfSize,
-                cursor: "ns-resize",
-            },
-            {
-                // Right center
-                xmin: this.xmax - halfSize,
-                ymin: this.ymin + (height / 2) - halfSize,
-                xmax: this.xmax + halfSize,
-                ymax: this.ymin + (height / 2) + halfSize,
-                cursor: "ew-resize",
-            },
-            {
-                // Bottom center
-                xmin: this.xmin + (width / 2) - halfSize,
-                ymin: this.ymax - halfSize,
-                xmax: this.xmin + (width / 2) + halfSize,
-                ymax: this.ymax + halfSize,
-                cursor: "ns-resize",
-            },
-            {
-                // Left center
-                xmin: this.xmin - halfSize,
-                ymin: this.ymin + (height / 2) - halfSize,
-                xmax: this.xmin + halfSize,
-                ymax: this.ymin + (height / 2) + halfSize,
-                cursor: "ew-resize",
-            },
-        ];
-    }
-
-    getWidth(): number {
-        return this.xmax - this.xmin;
-    }
-
-    getHeight(): number {
-        return this.ymax - this.ymin;
-    }
-
-    getArea(): number {
-        return this.getWidth() * this.getHeight();
-    }
-
-    toCanvasCoordinates(x: number, y: number): [number, number] {
-        x = x + this.canvasXmin;
-        y = y + this.canvasYmin;
-        return [x, y];
-    }
-
-    toBoxCoordinates(x: number, y: number): [number, number] {
-        x = x - this.canvasXmin;
-        y = y - this.canvasYmin;
-        return [x, y];
-    }
-
-    applyUserScale(): void {
-        this.xmin = this._xmin * this.canvasWindow.scale;
-        this.ymin = this._ymin * this.canvasWindow.scale;
-        this.xmax = this._xmax * this.canvasWindow.scale;
-        this.ymax = this._ymax * this.canvasWindow.scale;
-        this.updateHandles();
-    }
-
-    updateOffset(): void {
-        this.canvasXmin = this.canvasWindow.offsetX;
-        this.canvasYmin = this.canvasWindow.offsetY;
-        this.canvasXmax = this.canvasWindow.offsetX + this.canvasWindow.imageWidth * this.canvasWindow.scale;
-        this.canvasYmax = this.canvasWindow.offsetY + this.canvasWindow.imageHeight * this.canvasWindow.scale;
-        this.applyUserScale();
-    }
-    render(ctx: CanvasRenderingContext2D): void {
-        let xmin: number, ymin: number;
-
-        this.updateOffset()
-        // Render the box and border
-        ctx.beginPath();
-        [xmin, ymin] = this.toCanvasCoordinates(this.xmin, this.ymin);
-        ctx.rect(xmin, ymin, this.getWidth(), this.getHeight());
-        ctx.fillStyle = setAlpha(this.color, this.alpha);
-        ctx.fill();
-        if (this.isSelected) {
-            ctx.lineWidth = this.selectedThickness;
-        } else {
-            ctx.lineWidth = this.thickness;
-        }
-        ctx.strokeStyle = setAlpha(this.color, 1);
-        
-        ctx.stroke();
-        ctx.closePath();
-
-        // Render the label and background
-        if (this.label !== null && this.label.trim() !== ""){
-            if (this.isSelected) {
-                ctx.font = "bold 14px Arial";
-            } else {
-                ctx.font = "12px Arial";
-            }
-            const labelWidth = ctx.measureText(this.label).width + 10;
-            const labelHeight = 20;
-            let labelX = this.xmin;
-            let labelY = this.ymin - labelHeight;
-            ctx.fillStyle = "white";
-            [labelX, labelY] = this.toCanvasCoordinates(labelX, labelY);
-            ctx.fillRect(labelX, labelY, labelWidth, labelHeight);
-            ctx.lineWidth = 1;
-            ctx.strokeStyle = "black";
-            ctx.strokeRect(labelX, labelY, labelWidth, labelHeight);
-            ctx.fillStyle = "black";
-            ctx.fillText(this.label, labelX + 5, labelY + 15);
-        }
-
-        // Render the handles
-        ctx.fillStyle = setAlpha(this.color, 1);
-        for (const handle of this.resizeHandles) {
-            [xmin, ymin] = this.toCanvasCoordinates(handle.xmin, handle.ymin);
-            ctx.fillRect(
-                xmin,
-                ymin,
-                handle.xmax - handle.xmin,
-                handle.ymax - handle.ymin,
-            );
-        }
-    }
-
-    startDrag(event: MouseEvent): void {
-        this.isDragging = true;
-        this.offsetMouseX = event.clientX - this._xmin * this.canvasWindow.scale;
-        this.offsetMouseY = event.clientY - this._ymin * this.canvasWindow.scale;
-        document.addEventListener("pointermove", this.handleDrag);
-        document.addEventListener("pointerup", this.stopDrag);
-    }
-
-    stopDrag = (): void => {
-        this.isDragging = false;
-        document.removeEventListener("pointermove", this.handleDrag);
-        document.removeEventListener("pointerup", this.stopDrag);
-    };
-
-    handleDrag = (event: MouseEvent): void => {
-        if (this.isDragging && this.pointersCache.size === 1) {
-            let deltaX = (event.clientX - this.offsetMouseX) / this.canvasWindow.scale - this._xmin;
-            let deltaY = (event.clientY - this.offsetMouseY) / this.canvasWindow.scale - this._ymin;
-
-            const canvasW = (this.canvasXmax - this.canvasXmin) / this.canvasWindow.scale;
-            const canvasH = (this.canvasYmax - this.canvasYmin) / this.canvasWindow.scale;
-            deltaX = clamp(deltaX, -this._xmin, canvasW-this._xmax);
-            deltaY = clamp(deltaY, -this._ymin, canvasH-this._ymax);
-            this._xmin += deltaX;
-            this._ymin += deltaY;
-            this._xmax += deltaX;
-            this._ymax += deltaY;
-
-            this.applyUserScale();
-            // this.updateHandles();
-            this.renderCallBack();
-        }
-    };
-
-    isPointInsideBox(x: number, y: number): boolean {
-        [x, y] = this.toBoxCoordinates(x, y);
-        return (
-            x >= this.xmin &&
-            x <= this.xmax &&
-            y >= this.ymin &&
-            y <= this.ymax
-        );
-    }
-
-    indexOfPointInsideHandle(x: number, y: number): number {
-        [x, y] = this.toBoxCoordinates(x, y);
-        for (let i = 0; i < this.resizeHandles.length; i++) {
-            const handle = this.resizeHandles[i];
-            if (
-                x >= handle.xmin &&
-                x <= handle.xmax &&
-                y >= handle.ymin &&
-                y <= handle.ymax
-            ) {
-                this.resizingHandleIndex = i;
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    startCreating(event: MouseEvent, canvasX: number, canvasY: number): void {
-        this.isCreating = true;
-        this.offsetMouseX = canvasX;
-        this.offsetMouseY = canvasY;
-        document.addEventListener("pointermove", this.handleCreating);
-        document.addEventListener("pointerup", this.stopCreating);
-    }
-
-    handleCreating = (event: MouseEvent): void => {
-        if (this.isCreating && this.pointersCache.size === 1) {
-            let [x, y] = this.toBoxCoordinates(event.clientX, event.clientY);
-            x = (x - this.offsetMouseX) / this.canvasWindow.scale;
-            y = (y - this.offsetMouseY) / this.canvasWindow.scale;
-
-            if (x > this._xmax) {
-                if (this.creatingAnchorX == "xmax") {
-                    this._xmin = this._xmax;
-                }
-                this._xmax = x;
-                this.creatingAnchorX = "xmin";
-            } else if (x > this._xmin && x < this._xmax && this.creatingAnchorX == "xmin") {
-                this._xmax = x;
-            } else if (x > this._xmin && x < this._xmax && this.creatingAnchorX == "xmax") {
-                this._xmin = x;
-            } else if (x < this._xmin) {
-                if (this.creatingAnchorX == "xmin") {
-                    this._xmax = this._xmin;
-                }
-                this._xmin = x;
-                this.creatingAnchorX = "xmax";
-            }
-
-            if (y > this._ymax) {
-                if (this.creatingAnchorY == "ymax") {
-                    this._ymin = this._ymax;
-                }
-                this._ymax = y;
-                this.creatingAnchorY = "ymin";
-            } else if (y > this._ymin && y < this._ymax && this.creatingAnchorY == "ymin") {
-                this._ymax = y;
-            } else if (y > this._ymin && y < this._ymax && this.creatingAnchorY == "ymax") {
-                this._ymin = y;
-            } else if (y < this._ymin) {
-                if (this.creatingAnchorY == "ymin") {
-                    this._ymax = this._ymin;
-                }
-                this._ymin = y;
-                this.creatingAnchorY = "ymax";
-            }
-            this.applyUserScale();
-            // this.updateHandles();
-            this.renderCallBack();
-        }
-    }
-    
-    stopCreating = (event: MouseEvent): void => {
-        this.isCreating = false;
-        document.removeEventListener("pointermove", this.handleCreating);
-        document.removeEventListener("pointerup", this.stopCreating);
-
-        if (this.getArea() > 0) {
-            const canvasW = (this.canvasXmax - this.canvasXmin) / this.canvasWindow.scale;
-            const canvasH = (this.canvasYmax - this.canvasYmin) / this.canvasWindow.scale;
-            this._xmin = clamp(this._xmin, 0, canvasW - this.minSize);
-            this._ymin = clamp(this._ymin, 0, canvasH - this.minSize);
-            this._xmax = clamp(this._xmax, this.minSize, canvasW);
-            this._ymax = clamp(this._ymax, this.minSize, canvasH);
-
-            if (this.minSize > 0) {
-                if (this.getWidth() / this.canvasWindow.scale < this.minSize) {
-                    if (this.creatingAnchorX == "xmin") {
-                        this._xmax = this._xmin + this.minSize;
-                    } else {
-                        this._xmin = this._xmax - this.minSize;
-                    }
-                }
-                if (this.getHeight() / this.canvasWindow.scale < this.minSize) {
-                    if (this.creatingAnchorY == "ymin") {
-                        this._ymax = this._ymin + this.minSize;
-                    } else {
-                        this._ymin = this._ymax - this.minSize;
-                    }
-                }
-                if (this._xmax > canvasW) {
-                    this._xmin -= this._xmax - canvasW;
-                    this._xmax = canvasW;
-                } else if (this._xmin < 0) {
-                    this._xmax -= this._xmin;
-                    this._xmin = 0;
-                }
-                if (this._ymax > canvasH) {
-                    this._ymin -= this._ymax - canvasH;
-                    this._ymax = canvasH;
-                } else if (this._ymin < 0) {
-                    this._ymax -= this._ymin;
-                    this._ymin = 0;
-                }
-            }
-            this.applyUserScale();
-            // this.updateHandles();
-            this.renderCallBack();
-        }
-        this.onFinishCreation();
-    }
-
-    startResize(handleIndex: number, event: MouseEvent): void {
-        this.resizingHandleIndex = handleIndex;
-        this.isResizing = true;
-        this.offsetMouseX = event.clientX - this.resizeHandles[handleIndex].xmin;
-        this.offsetMouseY = event.clientY - this.resizeHandles[handleIndex].ymin;
-        document.addEventListener("pointermove", this.handleResize);
-        document.addEventListener("pointerup", this.stopResize);
-    }
-
-    handleResize = (event: MouseEvent): void => {
-        if (this.isResizing && this.pointersCache.size === 1) {
-            const mouseX = event.clientX;
-            const mouseY = event.clientY;
-            const deltaX = (mouseX - this.offsetMouseX - this.resizeHandles[this.resizingHandleIndex].xmin) / this.canvasWindow.scale;
-            const deltaY = (mouseY - this.offsetMouseY - this.resizeHandles[this.resizingHandleIndex].ymin) / this.canvasWindow.scale;
-            const canvasW = (this.canvasXmax - this.canvasXmin) / this.canvasWindow.scale;
-            const canvasH = (this.canvasYmax - this.canvasYmin) / this.canvasWindow.scale;
-            switch (this.resizingHandleIndex) {
-                case 0: // Top-left handle
-                    this._xmin += deltaX;
-                    this._ymin += deltaY;
-                    this._xmin = clamp(this._xmin, 0, this._xmax - this.minSize);
-                    this._ymin = clamp(this._ymin, 0, this._ymax - this.minSize);
-                    break;
-                case 1: // Top-right handle
-                    this._xmax += deltaX;
-                    this._ymin += deltaY;
-                    this._xmax = clamp(this._xmax, this._xmin + this.minSize, canvasW);
-                    this._ymin = clamp(this._ymin, 0, this._ymax - this.minSize);
-                    break;
-                case 2: // Bottom-right handle
-                    this._xmax += deltaX;
-                    this._ymax += deltaY;
-                    this._xmax = clamp(this._xmax, this._xmin + this.minSize, canvasW);
-                    this._ymax = clamp(this._ymax, this._ymin + this.minSize, canvasH);
-                    break;
-                case 3: // Bottom-left handle
-                    this._xmin += deltaX;
-                    this._ymax += deltaY;
-                    this._xmin = clamp(this._xmin, 0, this._xmax - this.minSize);
-                    this._ymax = clamp(this._ymax, this._ymin + this.minSize, canvasH);
-                    break;
-                case 4: // Top center handle
-                    this._ymin += deltaY;
-                    this._ymin = clamp(this._ymin, 0, this._ymax - this.minSize);
-                    break;
-                case 5: // Right center handle
-                    this._xmax += deltaX;
-                    this._xmax = clamp(this._xmax, this._xmin + this.minSize, canvasW);
-                    break;
-                case 6: // Bottom center handle
-                    this._ymax += deltaY;
-                    this._ymax = clamp(this._ymax, this._ymin + this.minSize, canvasH);
-                    break;
-                case 7: // Left center handle
-                    this._xmin += deltaX;
-                    this._xmin = clamp(this._xmin, 0, this._xmax - this.minSize);
-                    break;
-            }
-
-            // Update the resize handles
-            this.applyUserScale();
-            // this.updateHandles();
-            this.renderCallBack();
-        }
-    };
-
-    stopResize = (): void => {
-        this.isResizing = false;
-        document.removeEventListener("pointermove", this.handleResize);
-        document.removeEventListener("pointerup", this.stopResize);
-    };
-
-    onRotate(op: number): void {
-        const [_xmin, _xmax, _ymin, _ymax] = [this._xmin, this._xmax, this._ymin, this._ymax];
-        switch (op) {
-            case 1:
-                this._xmin = this.canvasWindow.imageWidth - _ymax;
-                this._xmax = this.canvasWindow.imageWidth - _ymin;
-                this._ymin = _xmin;
-                this._ymax = _xmax;
-                break;
-            case -1:
-                this._xmin = _ymin;
-                this._xmax = _ymax;
-                this._ymin = this.canvasWindow.imageHeight - _xmax;
-                this._ymax = this.canvasWindow.imageHeight - _xmin;
-                break;
-        }
-        this.applyUserScale();
-    }
-}
+import WindowViewer from "./WindowViewer";
+const clamp = (num: number, min: number, max: number) => Math.min(Math.max(num, min), max)
+
+
+function setAlpha(rgbColor: string, alpha: number) {
+    if (rgbColor.startsWith('rgba')) {
+        return rgbColor.replace(/[\d.]+$/, alpha.toString());
+    }
+    const matches = rgbColor.match(/\d+/g);
+    if (!matches || matches.length !== 3) {
+        return `rgba(50, 50, 50, ${alpha})`;
+    }
+    const [r, g, b] = matches;
+    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+}
+
+
+export default class Box {
+    label: string;
+    xmin: number;
+    ymin: number;
+    xmax: number;
+    ymax: number;
+    _xmin: number;
+    _ymin: number;
+    _xmax: number;
+    _ymax: number;
+    color: string;
+    alpha: number;
+    isDragging: boolean;
+    isResizing: boolean;
+    isSelected: boolean;
+    isCreating: boolean;
+    offsetMouseX: number;
+    offsetMouseY: number;
+    resizeHandleSize: number;
+    resizingHandleIndex: number;
+    minSize: number;
+    renderCallBack: () => void;
+    onFinishCreation: () => void;
+    canvasXmin: number;
+    canvasYmin: number;
+    canvasXmax: number;
+    canvasYmax: number;
+    scaleFactor: number;
+    thickness: number;
+    selectedThickness: number;
+    creatingAnchorX: string;
+    creatingAnchorY: string;
+    resizeHandles: {
+        xmin: number;
+        ymin: number;
+        xmax: number;
+        ymax: number;
+        cursor: string;
+    }[];
+    canvasWindow: WindowViewer;
+    pointersCache: Map<number, PointerEvent>;
+
+    constructor(
+        renderCallBack: () => void,
+        onFinishCreation: () => void,
+        canvasWindow: WindowViewer,
+        pointersCache: Map<number, PointerEvent>,
+        canvasXmin: number,
+        canvasYmin: number,
+        canvasXmax: number,
+        canvasYmax: number,
+        label: string,
+        xmin: number,
+        ymin: number,
+        xmax: number,
+        ymax: number,
+        color: string = "rgb(255, 255, 255)",
+        alpha: number = 0.5,
+        minSize: number = 25,
+        handleSize: number = 8,
+        thickness: number = 2,
+        selectedThickness: number = 4,
+        scaleFactor: number = 1,
+    ) {
+        this.renderCallBack = renderCallBack;
+        this.onFinishCreation = onFinishCreation;
+        this.canvasWindow = canvasWindow;
+        this.pointersCache = pointersCache;
+        this.canvasXmin = canvasXmin;
+        this.canvasYmin = canvasYmin;
+        this.canvasXmax = canvasXmax;
+        this.canvasYmax = canvasYmax;
+        this.scaleFactor = scaleFactor;
+        this.label = label;
+        this.isDragging = false;
+        this.isCreating = false;
+        this._xmin = xmin;
+        this._ymin = ymin;
+        this._xmax = xmax;
+        this._ymax = ymax;
+        this.xmin = this._xmin * this.canvasWindow.scale;
+        this.ymin = this._ymin * this.canvasWindow.scale;
+        this.xmax = this._xmax * this.canvasWindow.scale;
+        this.ymax = this._ymax * this.canvasWindow.scale;
+        this.isResizing = false;
+        this.isSelected = false;
+        this.offsetMouseX = 0;
+        this.offsetMouseY = 0;
+        this.resizeHandleSize = handleSize;
+        this.thickness = thickness;
+        this.selectedThickness = selectedThickness;
+        this.updateHandles();
+        this.resizingHandleIndex = -1;
+        this.minSize = minSize;
+        this.color = color;
+        this.alpha = alpha;
+        this.creatingAnchorX = "xmin";
+        this.creatingAnchorY = "ymin";
+    }
+
+    toJSON() {
+        return {
+            label: this.label,
+            xmin: this._xmin,
+            ymin: this._ymin,
+            xmax: this._xmax,
+            ymax: this._ymax,
+            color: this.color,
+            scaleFactor: this.scaleFactor,
+        };
+    }
+
+    setSelected(selected: boolean): void{
+        this.isSelected = selected;
+    }
+
+    setScaleFactor(scaleFactor: number) {
+        let scale = scaleFactor / this.scaleFactor;
+        this._xmin = Math.round(this._xmin * scale);
+        this._ymin = Math.round(this._ymin * scale);
+        this._xmax = Math.round(this._xmax * scale);
+        this._ymax = Math.round(this._ymax * scale);
+        this.applyUserScale();
+        // this.updateHandles();
+        this.scaleFactor = scaleFactor;
+    }
+
+    updateHandles(): void {
+        const halfSize = this.resizeHandleSize / 2;
+        const width = this.getWidth();
+        const height = this.getHeight();
+        this.resizeHandles = [
+            {
+                // Top left
+                xmin: this.xmin - halfSize,
+                ymin: this.ymin - halfSize,
+                xmax: this.xmin + halfSize,
+                ymax: this.ymin + halfSize,
+                cursor: "nwse-resize",
+            },
+            {
+                // Top right
+                xmin: this.xmax - halfSize,
+                ymin: this.ymin - halfSize,
+                xmax: this.xmax + halfSize,
+                ymax: this.ymin + halfSize,
+                cursor: "nesw-resize",
+            },
+            {
+                // Bottom right
+                xmin: this.xmax - halfSize,
+                ymin: this.ymax - halfSize,
+                xmax: this.xmax + halfSize,
+                ymax: this.ymax + halfSize,
+                cursor: "nwse-resize",
+            },
+            {
+                // Bottom left
+                xmin: this.xmin - halfSize,
+                ymin: this.ymax - halfSize,
+                xmax: this.xmin + halfSize,
+                ymax: this.ymax + halfSize,
+                cursor: "nesw-resize",
+            },
+            {
+                // Top center
+                xmin: this.xmin + (width / 2) - halfSize,
+                ymin: this.ymin - halfSize,
+                xmax: this.xmin + (width / 2) + halfSize,
+                ymax: this.ymin + halfSize,
+                cursor: "ns-resize",
+            },
+            {
+                // Right center
+                xmin: this.xmax - halfSize,
+                ymin: this.ymin + (height / 2) - halfSize,
+                xmax: this.xmax + halfSize,
+                ymax: this.ymin + (height / 2) + halfSize,
+                cursor: "ew-resize",
+            },
+            {
+                // Bottom center
+                xmin: this.xmin + (width / 2) - halfSize,
+                ymin: this.ymax - halfSize,
+                xmax: this.xmin + (width / 2) + halfSize,
+                ymax: this.ymax + halfSize,
+                cursor: "ns-resize",
+            },
+            {
+                // Left center
+                xmin: this.xmin - halfSize,
+                ymin: this.ymin + (height / 2) - halfSize,
+                xmax: this.xmin + halfSize,
+                ymax: this.ymin + (height / 2) + halfSize,
+                cursor: "ew-resize",
+            },
+        ];
+    }
+
+    getWidth(): number {
+        return this.xmax - this.xmin;
+    }
+
+    getHeight(): number {
+        return this.ymax - this.ymin;
+    }
+
+    getArea(): number {
+        return this.getWidth() * this.getHeight();
+    }
+
+    toCanvasCoordinates(x: number, y: number): [number, number] {
+        x = x + this.canvasXmin;
+        y = y + this.canvasYmin;
+        return [x, y];
+    }
+
+    toBoxCoordinates(x: number, y: number): [number, number] {
+        x = x - this.canvasXmin;
+        y = y - this.canvasYmin;
+        return [x, y];
+    }
+
+    applyUserScale(): void {
+        this.xmin = this._xmin * this.canvasWindow.scale;
+        this.ymin = this._ymin * this.canvasWindow.scale;
+        this.xmax = this._xmax * this.canvasWindow.scale;
+        this.ymax = this._ymax * this.canvasWindow.scale;
+        this.updateHandles();
+    }
+
+    updateOffset(): void {
+        this.canvasXmin = this.canvasWindow.offsetX;
+        this.canvasYmin = this.canvasWindow.offsetY;
+        this.canvasXmax = this.canvasWindow.offsetX + this.canvasWindow.imageWidth * this.canvasWindow.scale;
+        this.canvasYmax = this.canvasWindow.offsetY + this.canvasWindow.imageHeight * this.canvasWindow.scale;
+        this.applyUserScale();
+    }
+    render(ctx: CanvasRenderingContext2D): void {
+        let xmin: number, ymin: number;
+
+        this.updateOffset()
+        // Render the box and border
+        ctx.beginPath();
+        [xmin, ymin] = this.toCanvasCoordinates(this.xmin, this.ymin);
+        ctx.rect(xmin, ymin, this.getWidth(), this.getHeight());
+        ctx.fillStyle = setAlpha(this.color, this.alpha);
+        ctx.fill();
+        if (this.isSelected) {
+            ctx.lineWidth = this.selectedThickness;
+        } else {
+            ctx.lineWidth = this.thickness;
+        }
+        ctx.strokeStyle = setAlpha(this.color, 1);
+        
+        ctx.stroke();
+        ctx.closePath();
+
+        // Render the label and background
+        if (this.label !== null && this.label.trim() !== ""){
+            if (this.isSelected) {
+                ctx.font = "bold 14px Arial";
+            } else {
+                ctx.font = "12px Arial";
+            }
+            const labelWidth = ctx.measureText(this.label).width + 10;
+            const labelHeight = 20;
+            let labelX = this.xmin;
+            let labelY = this.ymin - labelHeight;
+            ctx.fillStyle = "white";
+            [labelX, labelY] = this.toCanvasCoordinates(labelX, labelY);
+            ctx.fillRect(labelX, labelY, labelWidth, labelHeight);
+            ctx.lineWidth = 1;
+            ctx.strokeStyle = "black";
+            ctx.strokeRect(labelX, labelY, labelWidth, labelHeight);
+            ctx.fillStyle = "black";
+            ctx.fillText(this.label, labelX + 5, labelY + 15);
+        }
+
+        // Render the handles
+        ctx.fillStyle = setAlpha(this.color, 1);
+        for (const handle of this.resizeHandles) {
+            [xmin, ymin] = this.toCanvasCoordinates(handle.xmin, handle.ymin);
+            ctx.fillRect(
+                xmin,
+                ymin,
+                handle.xmax - handle.xmin,
+                handle.ymax - handle.ymin,
+            );
+        }
+    }
+
+    startDrag(event: MouseEvent): void {
+        this.isDragging = true;
+        this.offsetMouseX = event.clientX - this._xmin * this.canvasWindow.scale;
+        this.offsetMouseY = event.clientY - this._ymin * this.canvasWindow.scale;
+        document.addEventListener("pointermove", this.handleDrag);
+        document.addEventListener("pointerup", this.stopDrag);
+    }
+
+    stopDrag = (): void => {
+        this.isDragging = false;
+        document.removeEventListener("pointermove", this.handleDrag);
+        document.removeEventListener("pointerup", this.stopDrag);
+    };
+
+    handleDrag = (event: MouseEvent): void => {
+        if (this.isDragging && this.pointersCache.size === 1) {
+            let deltaX = (event.clientX - this.offsetMouseX) / this.canvasWindow.scale - this._xmin;
+            let deltaY = (event.clientY - this.offsetMouseY) / this.canvasWindow.scale - this._ymin;
+
+            const canvasW = (this.canvasXmax - this.canvasXmin) / this.canvasWindow.scale;
+            const canvasH = (this.canvasYmax - this.canvasYmin) / this.canvasWindow.scale;
+            deltaX = clamp(deltaX, -this._xmin, canvasW-this._xmax);
+            deltaY = clamp(deltaY, -this._ymin, canvasH-this._ymax);
+            this._xmin += deltaX;
+            this._ymin += deltaY;
+            this._xmax += deltaX;
+            this._ymax += deltaY;
+
+            this.applyUserScale();
+            // this.updateHandles();
+            this.renderCallBack();
+        }
+    };
+
+    isPointInsideBox(x: number, y: number): boolean {
+        [x, y] = this.toBoxCoordinates(x, y);
+        return (
+            x >= this.xmin &&
+            x <= this.xmax &&
+            y >= this.ymin &&
+            y <= this.ymax
+        );
+    }
+
+    indexOfPointInsideHandle(x: number, y: number): number {
+        [x, y] = this.toBoxCoordinates(x, y);
+        for (let i = 0; i < this.resizeHandles.length; i++) {
+            const handle = this.resizeHandles[i];
+            if (
+                x >= handle.xmin &&
+                x <= handle.xmax &&
+                y >= handle.ymin &&
+                y <= handle.ymax
+            ) {
+                this.resizingHandleIndex = i;
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    startCreating(event: MouseEvent, canvasX: number, canvasY: number): void {
+        this.isCreating = true;
+        this.offsetMouseX = canvasX;
+        this.offsetMouseY = canvasY;
+        document.addEventListener("pointermove", this.handleCreating);
+        document.addEventListener("pointerup", this.stopCreating);
+    }
+
+    handleCreating = (event: MouseEvent): void => {
+        if (this.isCreating && this.pointersCache.size === 1) {
+            let [x, y] = this.toBoxCoordinates(event.clientX, event.clientY);
+            x = (x - this.offsetMouseX) / this.canvasWindow.scale;
+            y = (y - this.offsetMouseY) / this.canvasWindow.scale;
+
+            if (x > this._xmax) {
+                if (this.creatingAnchorX == "xmax") {
+                    this._xmin = this._xmax;
+                }
+                this._xmax = x;
+                this.creatingAnchorX = "xmin";
+            } else if (x > this._xmin && x < this._xmax && this.creatingAnchorX == "xmin") {
+                this._xmax = x;
+            } else if (x > this._xmin && x < this._xmax && this.creatingAnchorX == "xmax") {
+                this._xmin = x;
+            } else if (x < this._xmin) {
+                if (this.creatingAnchorX == "xmin") {
+                    this._xmax = this._xmin;
+                }
+                this._xmin = x;
+                this.creatingAnchorX = "xmax";
+            }
+
+            if (y > this._ymax) {
+                if (this.creatingAnchorY == "ymax") {
+                    this._ymin = this._ymax;
+                }
+                this._ymax = y;
+                this.creatingAnchorY = "ymin";
+            } else if (y > this._ymin && y < this._ymax && this.creatingAnchorY == "ymin") {
+                this._ymax = y;
+            } else if (y > this._ymin && y < this._ymax && this.creatingAnchorY == "ymax") {
+                this._ymin = y;
+            } else if (y < this._ymin) {
+                if (this.creatingAnchorY == "ymin") {
+                    this._ymax = this._ymin;
+                }
+                this._ymin = y;
+                this.creatingAnchorY = "ymax";
+            }
+            this.applyUserScale();
+            // this.updateHandles();
+            this.renderCallBack();
+        }
+    }
+    
+    stopCreating = (event: MouseEvent): void => {
+        this.isCreating = false;
+        document.removeEventListener("pointermove", this.handleCreating);
+        document.removeEventListener("pointerup", this.stopCreating);
+
+        if (this.getArea() > 0) {
+            const canvasW = (this.canvasXmax - this.canvasXmin) / this.canvasWindow.scale;
+            const canvasH = (this.canvasYmax - this.canvasYmin) / this.canvasWindow.scale;
+            this._xmin = clamp(this._xmin, 0, canvasW - this.minSize);
+            this._ymin = clamp(this._ymin, 0, canvasH - this.minSize);
+            this._xmax = clamp(this._xmax, this.minSize, canvasW);
+            this._ymax = clamp(this._ymax, this.minSize, canvasH);
+
+            if (this.minSize > 0) {
+                if (this.getWidth() / this.canvasWindow.scale < this.minSize) {
+                    if (this.creatingAnchorX == "xmin") {
+                        this._xmax = this._xmin + this.minSize;
+                    } else {
+                        this._xmin = this._xmax - this.minSize;
+                    }
+                }
+                if (this.getHeight() / this.canvasWindow.scale < this.minSize) {
+                    if (this.creatingAnchorY == "ymin") {
+                        this._ymax = this._ymin + this.minSize;
+                    } else {
+                        this._ymin = this._ymax - this.minSize;
+                    }
+                }
+                if (this._xmax > canvasW) {
+                    this._xmin -= this._xmax - canvasW;
+                    this._xmax = canvasW;
+                } else if (this._xmin < 0) {
+                    this._xmax -= this._xmin;
+                    this._xmin = 0;
+                }
+                if (this._ymax > canvasH) {
+                    this._ymin -= this._ymax - canvasH;
+                    this._ymax = canvasH;
+                } else if (this._ymin < 0) {
+                    this._ymax -= this._ymin;
+                    this._ymin = 0;
+                }
+            }
+            this.applyUserScale();
+            // this.updateHandles();
+            this.renderCallBack();
+        }
+        this.onFinishCreation();
+    }
+
+    startResize(handleIndex: number, event: MouseEvent): void {
+        this.resizingHandleIndex = handleIndex;
+        this.isResizing = true;
+        this.offsetMouseX = event.clientX - this.resizeHandles[handleIndex].xmin;
+        this.offsetMouseY = event.clientY - this.resizeHandles[handleIndex].ymin;
+        document.addEventListener("pointermove", this.handleResize);
+        document.addEventListener("pointerup", this.stopResize);
+    }
+
+    handleResize = (event: MouseEvent): void => {
+        if (this.isResizing && this.pointersCache.size === 1) {
+            const mouseX = event.clientX;
+            const mouseY = event.clientY;
+            const deltaX = (mouseX - this.offsetMouseX - this.resizeHandles[this.resizingHandleIndex].xmin) / this.canvasWindow.scale;
+            const deltaY = (mouseY - this.offsetMouseY - this.resizeHandles[this.resizingHandleIndex].ymin) / this.canvasWindow.scale;
+            const canvasW = (this.canvasXmax - this.canvasXmin) / this.canvasWindow.scale;
+            const canvasH = (this.canvasYmax - this.canvasYmin) / this.canvasWindow.scale;
+            switch (this.resizingHandleIndex) {
+                case 0: // Top-left handle
+                    this._xmin += deltaX;
+                    this._ymin += deltaY;
+                    this._xmin = clamp(this._xmin, 0, this._xmax - this.minSize);
+                    this._ymin = clamp(this._ymin, 0, this._ymax - this.minSize);
+                    break;
+                case 1: // Top-right handle
+                    this._xmax += deltaX;
+                    this._ymin += deltaY;
+                    this._xmax = clamp(this._xmax, this._xmin + this.minSize, canvasW);
+                    this._ymin = clamp(this._ymin, 0, this._ymax - this.minSize);
+                    break;
+                case 2: // Bottom-right handle
+                    this._xmax += deltaX;
+                    this._ymax += deltaY;
+                    this._xmax = clamp(this._xmax, this._xmin + this.minSize, canvasW);
+                    this._ymax = clamp(this._ymax, this._ymin + this.minSize, canvasH);
+                    break;
+                case 3: // Bottom-left handle
+                    this._xmin += deltaX;
+                    this._ymax += deltaY;
+                    this._xmin = clamp(this._xmin, 0, this._xmax - this.minSize);
+                    this._ymax = clamp(this._ymax, this._ymin + this.minSize, canvasH);
+                    break;
+                case 4: // Top center handle
+                    this._ymin += deltaY;
+                    this._ymin = clamp(this._ymin, 0, this._ymax - this.minSize);
+                    break;
+                case 5: // Right center handle
+                    this._xmax += deltaX;
+                    this._xmax = clamp(this._xmax, this._xmin + this.minSize, canvasW);
+                    break;
+                case 6: // Bottom center handle
+                    this._ymax += deltaY;
+                    this._ymax = clamp(this._ymax, this._ymin + this.minSize, canvasH);
+                    break;
+                case 7: // Left center handle
+                    this._xmin += deltaX;
+                    this._xmin = clamp(this._xmin, 0, this._xmax - this.minSize);
+                    break;
+            }
+
+            // Update the resize handles
+            this.applyUserScale();
+            // this.updateHandles();
+            this.renderCallBack();
+        }
+    };
+
+    stopResize = (): void => {
+        this.isResizing = false;
+        document.removeEventListener("pointermove", this.handleResize);
+        document.removeEventListener("pointerup", this.stopResize);
+    };
+
+    onRotate(op: number): void {
+        const [_xmin, _xmax, _ymin, _ymax] = [this._xmin, this._xmax, this._ymin, this._ymax];
+        switch (op) {
+            case 1:
+                this._xmin = this.canvasWindow.imageWidth - _ymax;
+                this._xmax = this.canvasWindow.imageWidth - _ymin;
+                this._ymin = _xmin;
+                this._ymax = _xmax;
+                break;
+            case -1:
+                this._xmin = _ymin;
+                this._xmax = _ymax;
+                this._ymin = this.canvasWindow.imageHeight - _xmax;
+                this._ymax = this.canvasWindow.imageHeight - _xmin;
+                break;
+        }
+        this.applyUserScale();
+    }
+}

src/frontend/shared/Canvas.svelte

@@ -1,872 +1,869 @@
-<script lang="ts">
-    import { onMount, createEventDispatcher } from "svelte";
-	import { BoundingBox, Hand, Trash, Label } from "./icons/index";
-	import ModalBox from "./ModalBox.svelte";
-	import Box from "./Box";
-	import { Colors } from './Colors.js';
-	import AnnotatedImageData from "./AnnotatedImageData";
-	import { Undo, Redo } from "@gradio/icons";
-	import WindowViewer from "./WindowViewer";
-
-	enum Mode {creation, drag}
-
-    export let imageUrl: string | null = null;
-	export let interactive: boolean;
-	export let boxAlpha = 0.5;
-	export let boxMinSize = 10;
-	export let handleSize: number;
-	export let boxThickness: number;
-	export let boxSelectedThickness: number;
-	export let value: null | AnnotatedImageData;
-	export let choices = [];
-    export let choicesColors = [];
-	export let disableEditBoxes: boolean = false;
-	export let height: number | string = "100%";
-	export let width: number | string = "100%";
-	export let singleBox: boolean = false;
-	export let showRemoveButton: boolean = null;
-	export let handlesCursor: boolean = true;
-	export let useDefaultLabel: boolean = false;
-	export let enableKeyboardShortcuts: boolean = true;
-
-	if (showRemoveButton === null) {
-		showRemoveButton = (disableEditBoxes);
-	}
-
-    let canvas: HTMLCanvasElement;
-	let annotatorContainerDiv: HTMLDivElement;
-	let ctx: CanvasRenderingContext2D;
-    let image = null;
-	let selectedBox = -1;
-	let mode: Mode = Mode.drag;
-	let pointersCache: Map<number, PointerEvent> = new Map();
-	let canvasWindow: WindowViewer = new WindowViewer(draw, pointersCache);
-
-	if (value !== null && value.boxes.length == 0) {
-		mode = Mode.creation;
-	}
-
-	let canvasXmin = 0;
-	let canvasYmin = 0;
-	let canvasXmax = 0;
-	let canvasYmax = 0;
-	let scaleFactor = 1.0;
-
-	let imageWidth = 0;
-	let imageHeight = 0;
-
-	let editModalVisible = false;
-	let newModalVisible = false;
-	let editDefaultLabelVisible = false;
-
-	let labelDetailLock = useDefaultLabel;
-	let defaultLabelCache = {
-		label: "",
-		color: ""
-	};
-
-	let touchScaleValues = {
-		x: 0,
-		y: 0,
-		distance: 0,
-	}
-	const touchScaleDeadzone = 100;
-
-	const dispatch = createEventDispatcher<{
-		change: undefined;
-	}>();
-
-	function colorHexToRGB(hex: string) {
-		var r = parseInt(hex.slice(1, 3), 16),
-			g = parseInt(hex.slice(3, 5), 16),
-			b = parseInt(hex.slice(5, 7), 16);
-		return "rgb(" + r + ", " + g + ", " + b + ")";
-	}
-
-	function colorRGBAToHex(rgba: string) {
-		const rgbaValues = rgba.match(/(\d+(\.\d+)?)/g);
-		const r = parseInt(rgbaValues[0]);
-		const g = parseInt(rgbaValues[1]);
-		const b = parseInt(rgbaValues[2]);
-		const hex = "#" + ((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1);
-		return hex;
-	}
-	
-    function draw() {
-		if (ctx) {
-			ctx.clearRect(0, 0, canvas.width, canvas.height);
-			ctx.save();
-			ctx.translate(canvasWindow.offsetX, canvasWindow.offsetY);
-			ctx.scale(canvasWindow.scale, canvasWindow.scale);
-			if (image !== null){
-				switch (value.orientation) {
-					case 0:
-						ctx.drawImage(image, 0, 0, imageWidth, imageHeight);
-						break;
-					case 1:
-						ctx.translate(imageWidth, 0);
-						ctx.rotate(Math.PI / 2);
-						ctx.drawImage(image, 0, 0, imageHeight, imageWidth);
-						break;
-					case 2:
-						ctx.translate(imageWidth, imageHeight);
-						ctx.rotate(Math.PI);
-						ctx.drawImage(image, 0, 0, imageWidth, imageHeight);
-						break;
-					case 3:
-						ctx.translate(0, imageHeight);
-						ctx.rotate(-Math.PI / 2);
-						ctx.drawImage(image, 0, 0, imageHeight, imageWidth);
-						break;
-				}
-
-
-				ctx.restore();
-				// ctx.resetTransform();
-			}
-			
-			for (const box of value.boxes.slice().reverse()) {
-				box.render(ctx);
-			}
-		}
-	}
-
-    function selectBox(index: number) {
-		selectedBox = index;
-		value.boxes.forEach(box => {box.setSelected(false);});
-		if (index >= 0 && index < value.boxes.length){
-			value.boxes[index].setSelected(true);
-		}
-		draw();
-	}
-
-	const getDistance = (touch1: PointerEvent, touch2: PointerEvent) => {
-		const distance = Math.sqrt(
-			Math.pow(touch1.clientX - touch2.clientX, 2) +
-			Math.pow(touch1.clientY - touch2.clientY, 2)
-		);
-		return distance < touchScaleDeadzone ? touchScaleDeadzone : distance;
-	};
-
-	function handlePointerDown(event: PointerEvent) {
-		if (!interactive) {
-			return;
-		}
-
-		event.preventDefault();
-		canvas.setPointerCapture(event.pointerId);
-		pointersCache.set(event.pointerId, event);
-
-		if (pointersCache.size == 1) {
-			if (mode === Mode.creation) {
-				createBox(event);
-			} else if (mode === Mode.drag) {
-				clickBox(event);
-			}
-		} else if (pointersCache.size == 2) {
-			canvasWindow.isDragging = false;
-			value.boxes.forEach(box => {
-				box.isCreating = false;
-				box.isDragging = false;
-				box.isResizing = false;
-			});
-			const pointerArray = Array.from(pointersCache.values());
-			const touch1 = pointerArray[0];
-			const touch2 = pointerArray[1];
-			const distance = getDistance(touch1, touch2);
-			const rect = canvas.getBoundingClientRect();
-			const centerX = (touch1.clientX + touch2.clientX) / 2 - rect.left;
-			const centerY = (touch1.clientY + touch2.clientY) / 2 - rect.top;
-
-			touchScaleValues.distance = distance;
-			touchScaleValues.x = centerX;
-			touchScaleValues.y = centerY;
-		}
-
-	}
-
-	function clickBox(event: PointerEvent) {
-		const rect = canvas.getBoundingClientRect();
-		const mouseX = event.clientX - rect.left;
-		const mouseY = event.clientY - rect.top;
-		let selectedBoxFlag = false;
-
-		// Check if the mouse is over any of the resizing handles
-		for (const [i, box] of value.boxes.entries()) {
-			const handleIndex = box.indexOfPointInsideHandle(mouseX, mouseY);
-			if (handleIndex >= 0) {
-				selectedBoxFlag = true;
-				selectBox(i);
-				box.startResize(handleIndex, event);
-				return;
-			}
-		}
-
-		// Check if the mouse is inside a box
-		for (const [i, box] of value.boxes.entries()) {
-			if (box.isPointInsideBox(mouseX, mouseY)) {
-				selectedBoxFlag = true;
-				selectBox(i);
-				box.startDrag(event);
-				return;
-			}
-		}
-
-		if (!singleBox) {
-			selectBox(-1);
-		}
-
-		if (!selectedBoxFlag) {
-			canvasWindow.startDrag(event);
-		}
-	}
-
-	function handlePointerUp(event: PointerEvent) {
-		if (!interactive) {
-			return;
-		}
-		pointersCache.delete(event.pointerId);
-		canvas.releasePointerCapture(event.pointerId);
-		dispatch("change");
-	}
-
-	function handlePointerCancel(event: PointerEvent) {
-		if (!interactive) {
-			return;
-		}
-		pointersCache.delete(event.pointerId);
-		canvas.releasePointerCapture(event.pointerId);
-		dispatch("change");
-	}
-
-	function handlePointerMove(event: PointerEvent) {
-		if (!interactive) {
-			return;
-		}
-
-		event.preventDefault();
-		if (event.pointerType === "mouse") {
-			if (!handlesCursor) {
-				return;
-			}
-
-			if (value === null) {
-				return;
-			}
-
-			if (mode !== Mode.drag) {
-				return;
-			}
-
-			const rect = canvas.getBoundingClientRect();
-			const mouseX = event.clientX - rect.left;
-			const mouseY = event.clientY - rect.top;
-
-			for (const [_, box] of value.boxes.entries()) {
-				const handleIndex = box.indexOfPointInsideHandle(mouseX, mouseY);
-				if (handleIndex >= 0) {
-					canvas.style.cursor = box.resizeHandles[handleIndex].cursor;
-					return;
-				}
-			}
-
-			canvas.style.cursor = "default";
-
-		} else { // touch
-			if (!pointersCache.has(event.pointerId)) {
-				return;
-			}
-			pointersCache.set(event.pointerId, event);
-
-			if (pointersCache.size === 2) {
-				const pointerArray = Array.from(pointersCache.values());
-				const touch1 = pointerArray[0];
-				const touch2 = pointerArray[1];
-				const distance = getDistance(touch1, touch2);
-				const rect = canvas.getBoundingClientRect();
-				const centerX = (touch1.clientX + touch2.clientX) / 2 - rect.left;
-				const centerY = (touch1.clientY + touch2.clientY) / 2 - rect.top;
-
-				const newScaleTmp = parseFloat(
-					(canvasWindow.scale * (distance / touchScaleValues.distance)).toFixed(2)
-				);
-				const newScale = newScaleTmp < 1 ? 1 : newScaleTmp;
-
-				const scaleDelta = newScale / canvasWindow.scale;
-				canvasWindow.offsetX = touchScaleValues.x - (touchScaleValues.x - canvasWindow.offsetX) * scaleDelta;
-				canvasWindow.offsetY = touchScaleValues.y - (touchScaleValues.y - canvasWindow.offsetY) * scaleDelta;
-
-				const dx = centerX - touchScaleValues.x;
-				const dy = centerY - touchScaleValues.y;
-				canvasWindow.offsetX += dx;
-				canvasWindow.offsetY += dy;
-				canvasWindow.scale = newScale;
-
-				touchScaleValues.x = centerX;
-				touchScaleValues.y = centerY;
-				touchScaleValues.distance = distance;
-
-				draw();
-			}
-		}
-	}
-
-	function resetView() {
-		// Calculate minimum scale to fit image
-		const scaleX = canvas.width / imageWidth;
-		const scaleY = canvas.height / imageHeight;
-		const minScale = Math.min(scaleX, scaleY);
-				
-		// Set scale and center
-		canvasWindow.scale = minScale;
-		canvasWindow.offsetX = (canvas.width - imageWidth * minScale) / 2;
-		canvasWindow.offsetY = (canvas.height - imageHeight * minScale) / 2;
-		
-		draw();
-	}
-
-	function handleKeyPress(event: KeyboardEvent) {
-		if (!enableKeyboardShortcuts || event.target !== annotatorContainerDiv || !interactive) {
-			return;
-		}
-		
-		const key = event.key.toLowerCase();
-		const blockedKeys = new Set(['delete', 'c', 'd', 'e', ' ']);
-
-		if (blockedKeys.has(key)) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-		
-		switch (key) {
-			case 'delete': onDeleteBox(); break;
-			case 'c': setCreateMode(); break;
-			case 'd': setDragMode(); break;
-			case 'e': onEditBox(); break;
-			case ' ': resetView(); break;
-		}
-	}
-
-	function focusAnnotator() {
-		setTimeout(() => {annotatorContainerDiv?.focus();}, 0);
-	}
-
-	function handleMouseWheel(event: WheelEvent) {
-		if (!interactive) {
-			return;
-		}
-
-		event.preventDefault();
-		const delta = 1 / (1 + (event.deltaY / 1000) * 0.5);
-
-		const newScaleTmp = parseFloat((canvasWindow.scale * delta).toFixed(2));
-		const newScale = newScaleTmp < 1 ? 1 : newScaleTmp;
-		const rect = canvas.getBoundingClientRect();
-		const mouseX = event.clientX - rect.left;
-		const mouseY = event.clientY - rect.top;
-
-		const worldX = (mouseX - canvasWindow.offsetX) / canvasWindow.scale;
-		const worldY = (mouseY - canvasWindow.offsetY) / canvasWindow.scale;
-
-		canvasWindow.offsetX = mouseX - worldX * newScale;
-		canvasWindow.offsetY = mouseY - worldY * newScale;
-
-		canvasWindow.scale = newScale;
-		draw();
-	}
-
-	function createBox(event: PointerEvent) {
-		const rect = canvas.getBoundingClientRect();
-		const x = (event.clientX - rect.left - canvasWindow.offsetX) / scaleFactor / canvasWindow.scale;
-		const y = (event.clientY - rect.top - canvasWindow.offsetY) / scaleFactor / canvasWindow.scale;
-		let color;
-		if (choicesColors.length > 0) {
-			color = colorHexToRGB(choicesColors[0]);
-		} else if (singleBox) {
-			if (value.boxes.length > 0) {
-				color = value.boxes[0].color;
-			} else {
-				color = Colors[0];
-			}
-		} else {
-			color = Colors[value.boxes.length % Colors.length];
-		}
-		
-		let box = new Box(
-			draw,
-			onBoxFinishCreation,
-			canvasWindow,
-			pointersCache,
-			canvasXmin,
-			canvasYmin,
-			canvasXmax,
-			canvasYmax,
-			"",
-			x,
-			y,
-			x,
-			y,
-			color,
-			boxAlpha,
-			boxMinSize,
-			handleSize,
-			boxThickness,
-			boxSelectedThickness
-		);
-		box.startCreating(event, rect.left, rect.top);
-		if (singleBox) {
-			value.boxes = [box];
-		} else {
-			value.boxes = [box, ...value.boxes];
-		}
-		selectBox(0);
-		draw();
-		dispatch("change");
-	}
-
-	function setCreateMode() {
-		mode = Mode.creation;
-		canvas.style.cursor = "crosshair";
-	}
-
-	function setDragMode() {
-		mode = Mode.drag;
-		canvas.style.cursor = "default";
-	}
-
-	function onBoxFinishCreation() {
-		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
-			if (value.boxes[selectedBox].getArea() < 1) {
-				onDeleteBox();
-			} else {
-				if (!disableEditBoxes) {
-					if (labelDetailLock) {
-						onUseDefaultLabelModalNew();
-					} else{
-						newModalVisible = true;
-					}
-				}
-				if (singleBox) {
-					setDragMode();
-				}
-			}
-		}
-	}
-
-	function onEditBox() {
-		if (selectedBox >= 0 && selectedBox < value.boxes.length && !disableEditBoxes) {
-			editModalVisible = true;
-		}
-	}
-
-	function handleDoubleClick(event: MouseEvent){
-		if (!interactive) {
-			return;
-		}
-		
-		onEditBox();
-	}
-
-	function onModalEditChange(event) {
-		editModalVisible = false;
-		focusAnnotator();
-		const { detail } = event;
-		let label = detail.label;
-		let color = detail.color;
-		let ret = detail.ret;
-		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
-			let box = value.boxes[selectedBox];
-			if (ret == 1) {
-				box.label = label;
-				box.color = colorHexToRGB(color);
-				draw();
-				dispatch("change");
-			} else if (ret == -1) {
-				onDeleteBox();
-			}
-		}
-	}
-
-	function onModalNewChange(event) {
-		newModalVisible = false;
-		focusAnnotator();
-		const { detail } = event;
-		let label = detail.label;
-		let color = detail.color;
-		let ret = detail.ret;
-		let lock = detail.lock;
-		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
-			let box = value.boxes[selectedBox];
-			if (ret == 1) {
-				labelDetailLock = lock;
-				defaultLabelCache.label = label;
-				defaultLabelCache.color = color;
-				box.label = label;
-				box.color = colorHexToRGB(color);
-				draw();
-				dispatch("change");
-			} else {
-				onDeleteBox();
-			}
-		}
-	}
-
-	function onDefaultLabelEditChange(event) {
-		editDefaultLabelVisible = false;
-		focusAnnotator();
-		const { detail } = event;
-		let label = detail.label;
-		let color = detail.color;
-		let ret = detail.ret;
-		let lock = detail.lock;
-		if (ret == 1) {
-			labelDetailLock = lock;
-			defaultLabelCache.label = label;
-			defaultLabelCache.color = color;
-		}
-	}
-
-	function onUseDefaultLabelModalNew(){
-		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
-			let box = value.boxes[selectedBox];
-			box.label = defaultLabelCache.label;
-			if (defaultLabelCache.color !== "") {
-				box.color = colorHexToRGB(defaultLabelCache.color);
-			}
-			draw();
-			dispatch("change");
-		}
-	}
-
-    function onDeleteBox() {
-		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
-			value.boxes.splice(selectedBox, 1);
-			selectBox(-1);
-			if (singleBox) {
-				setCreateMode();
-			}
-			dispatch("change");
-		}
-	}
-	
-	/**
-	 * Rotate the image and all the boxes
-	 * @param op 1: rotate clockwise, -1: rotate counterclockwise
-	 */
-	function onRotateImage(op: number) {
-		value.orientation = (((value.orientation + op) % 4) + 4 ) % 4;
-		canvasWindow.orientation = value.orientation;
-
-		resize();
-		for (const box of value.boxes) {
-			box.onRotate(op);
-		}
-		draw();
-	}
-
-	function resize() {
-		if (canvas) {
-			scaleFactor = 1;
-			canvas.width = canvas.clientWidth;
-
-			canvasWindow.setRotatedImage(image);
-			
-			if (image !== null) {
-				if (canvasWindow.imageRotatedWidth > canvas.width) {
-					scaleFactor = canvas.width / canvasWindow.imageRotatedWidth;
-					imageWidth = Math.round(canvasWindow.imageRotatedWidth * scaleFactor);
-					imageHeight = Math.round(canvasWindow.imageRotatedHeight * scaleFactor);
-					canvasXmin = 0;
-					canvasYmin = 0;
-					canvasXmax = imageWidth;
-					canvasYmax = imageHeight;
-					canvas.height = imageHeight;
-				} else {
-					imageWidth = canvasWindow.imageRotatedWidth;
-					imageHeight = canvasWindow.imageRotatedHeight;
-					var x = (canvas.width - imageWidth) / 2;
-					canvasXmin = x;
-					canvasYmin = 0;
-					canvasXmax = x + imageWidth;
-					canvasYmax = imageHeight;
-					canvas.height = imageHeight;
-				}
-
-				canvasWindow.imageWidth = imageWidth;
-				canvasWindow.imageHeight = imageHeight;
-
-			} else {
-				canvasXmin = 0;
-				canvasYmin = 0;
-				canvasXmax = canvas.width;
-				canvasYmax = canvas.height;
-				canvas.height = canvas.clientHeight;
-			}
-			
-			canvasWindow.resize(canvas.width, canvas.height, canvasXmin, canvasYmin);
-
-			if (canvasXmax > 0 && canvasYmax > 0){
-				for (const box of value.boxes) {
-					box.canvasXmin = canvasXmin;
-					box.canvasYmin = canvasYmin;
-					box.canvasXmax = canvasXmax;
-					box.canvasYmax = canvasYmax;
-					box.setScaleFactor(scaleFactor);
-				}
-			}
-			draw();
-			dispatch("change");
-		}
-	}
-	const observer = new ResizeObserver(resize);
-
-	function parseInputBoxes() {
-		for (let i = 0; i < value.boxes.length; i++) {
-			let box = value.boxes[i];
-			if (!(box instanceof Box)) {
-				let color = "";
-				let label = "";
-				if (box.hasOwnProperty("color")) {
-					color = box["color"];
-					if (Array.isArray(color) && color.length === 3) {
-            			color = `rgb(${color[0]}, ${color[1]}, ${color[2]})`;
-        			}
-				} else {
-					color = Colors[i % Colors.length];
-				}
-				if (box.hasOwnProperty("label")) {
-					label = box["label"];
-				}
-				box = new Box(
-					draw,
-					onBoxFinishCreation,
-					canvasWindow,
-					pointersCache,
-					canvasXmin,
-					canvasYmin,
-					canvasXmax,
-					canvasYmax,
-					label,
-					box["xmin"],
-					box["ymin"],
-					box["xmax"],
-					box["ymax"],
-					color,
-					boxAlpha,
-					boxMinSize,
-					handleSize,
-					boxThickness,
-					boxSelectedThickness
-				);
-				value.boxes[i] = box;
-			}
-		}
-	}
-
-	$: {
-		value;
-		canvasWindow.orientation = value.orientation;
-		setImage();
-		parseInputBoxes();
-		resize();
-		draw();
-	}
-
-	function setImage(){
-		if (imageUrl !== null) {
-			if (image === null || image.src != imageUrl) {
-				image = new Image();
-				image.src = imageUrl;
-				image.onload = function(){
-					resize();
-					draw();
-				}
-			}
-		}
-	}
-
-	onMount(() => {
-		if (Array.isArray(choices) && choices.length > 0) {
-			if (!Array.isArray(choicesColors) || choicesColors.length == 0) {
-				for (let i = 0; i < choices.length; i++) {
-					let color = Colors[i % Colors.length];
-					choicesColors.push(colorRGBAToHex(color));
-				}
-			}
-			defaultLabelCache.label = choices[0][0];
-			defaultLabelCache.color = choicesColors[0];
-		}
-
-		ctx = canvas.getContext("2d");
-		observer.observe(canvas);
-
-		if (selectedBox < 0 && value !== null && value.boxes.length > 0) {
-			selectBox(0);
-		}
-		
-		setImage();
-		resize();
-		draw();
-	});
-
-</script>
-
-<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-<!-- svelte-ignore a11y-no-static-element-interactions -->
-<div
-	class="annotator-container"
-	tabindex="0"
-	bind:this={annotatorContainerDiv}
-	on:keydown={handleKeyPress}
-	on:click={() => annotatorContainerDiv.focus()}
->
-	<div class="canvas-container">
-		<canvas
-			bind:this={canvas}
-			on:pointerdown={handlePointerDown}
-			on:pointerup={handlePointerUp}
-			on:pointermove={handlePointerMove}
-			on:pointercancel={handlePointerCancel}
-			on:dblclick={handleDoubleClick}
-			on:wheel={handleMouseWheel}
-			style="height: {height}; width: {width};"
-			class="canvas-annotator"
-		></canvas>
-	</div>
-
-	{#if interactive}
-		<span class="canvas-control">
-			<button
-				class="icon"
-				class:selected={mode === Mode.creation}
-				aria-label="Create box"
-				title="Create box (C)"
-				on:click={() => setCreateMode()}><BoundingBox/></button
-			>
-			<button
-				class="icon"
-				class:selected={mode === Mode.drag}
-				aria-label="Drag boxes"
-				title="Drag boxes (D)"
-				on:click={() => setDragMode()}><Hand/></button
-			>
-			{#if showRemoveButton}
-				<button
-					class="icon"
-					aria-label="Remove box"
-					title="Remove box (Del)"
-					on:click={() => onDeleteBox()}><Trash/></button
-				>
-			{/if}
-			{#if !disableEditBoxes && labelDetailLock}
-				<button
-					class="icon"
-					aria-label="Edit label"
-					title="Edit label"
-					on:click={() => editDefaultLabelVisible = true}><Label/></button
-				>
-			{/if}
-			<button
-				class="icon"
-				aria-label="Rotate counterclockwise"
-				title="Rotate counterclockwise"
-				on:click={() => onRotateImage(-1)}><Undo/></button
-			>
-			<button
-				class="icon"
-				aria-label="Rotate clockwise"
-				title="Rotate clockwise"
-				on:click={() => onRotateImage(1)}><Redo/></button
-			>
-		</span>
-	{/if}
-</div>
-
-{#if editModalVisible}
-	<ModalBox
-		on:change={onModalEditChange}
-		on:enter{onModalEditChange}
-		choices={choices}
-		choicesColors={choicesColors}
-		label={selectedBox >= 0 && selectedBox < value.boxes.length ? value.boxes[selectedBox].label : ""}
-		color={selectedBox >= 0 && selectedBox < value.boxes.length ? colorRGBAToHex(value.boxes[selectedBox].color) : ""}
-	/>
-{/if}
-
-{#if newModalVisible}
-	<ModalBox
-		on:change={onModalNewChange}
-		on:enter{onModalNewChange}
-		choices={choices}
-		showRemove={false}
-		choicesColors={choicesColors}
-		label={selectedBox >= 0 && selectedBox < value.boxes.length ? value.boxes[selectedBox].label : ""}
-		color={selectedBox >= 0 && selectedBox < value.boxes.length ? colorRGBAToHex(value.boxes[selectedBox].color) : ""}
-		labelDetailLock = {labelDetailLock}
-	/>
-{/if}
-
-{#if editDefaultLabelVisible}
-	<ModalBox
-		on:change={onDefaultLabelEditChange}
-		on:enter{onDefaultLabelEditChange}
-		choices={choices}
-		showRemove={false}
-		choicesColors={choicesColors}
-		label={selectedBox >= 0 && selectedBox < value.boxes.length ? value.boxes[selectedBox].label : ""}
-		color={selectedBox >= 0 && selectedBox < value.boxes.length ? colorRGBAToHex(value.boxes[selectedBox].color) : ""}
-		labelDetailLock = {labelDetailLock}
-	/>
-{/if}
-
-<style>
-	.canvas-annotator {
-		border-color: var(--block-border-color);
-		width: 100%;
-		height: 100%;
-		display: block;
-		touch-action: none;
-	}
-
-	.canvas-control {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-top: 1px solid var(--border-color-primary);
-		width: 95%;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		margin-left: auto;
-		margin-right: auto;
-		margin-top: var(--size-2);
-	}
-
-	.icon {
-		width: 22px;
-		height: 22px;
-		margin: var(--spacing-lg) var(--spacing-xs);
-		padding: var(--spacing-xs);
-		color: var(--neutral-400);
-		border-radius: var(--radius-md);
-	}
-
-	.icon:hover,
-	.icon:focus {
-		color: var(--color-accent);
-	}
-	
-	.selected {
-		color: var(--color-accent);
-	}
-
-	.canvas-container {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.canvas-container:focus {
-    	outline: none;
-	}
-</style>
+<script lang="ts">
+    import { onMount, createEventDispatcher } from "svelte";
+	import { BoundingBox, Hand, Trash, Label } from "./icons/index";
+	import ModalBox from "./ModalBox.svelte";
+	import Box from "./Box";
+	import { Colors } from './Colors.js';
+	import AnnotatedImageData from "./AnnotatedImageData";
+	import { Undo, Redo } from "@gradio/icons";
+	import WindowViewer from "./WindowViewer";
+
+	enum Mode {creation, drag}
+
+    export let imageUrl: string | null = null;
+	export let interactive: boolean;
+	export let boxAlpha = 0.5;
+	export let boxMinSize = 10;
+	export let handleSize: number;
+	export let boxThickness: number;
+	export let boxSelectedThickness: number;
+	export let value: null | AnnotatedImageData;
+	export let choices = [];
+    export let choicesColors = [];
+	export let disableEditBoxes: boolean = false;
+	export let height: number | string = "100%";
+	export let width: number | string = "100%";
+	export let singleBox: boolean = false;
+	export let showRemoveButton: boolean = null;
+	export let handlesCursor: boolean = true;
+	export let useDefaultLabel: boolean = false;
+	export let enableKeyboardShortcuts: boolean = true;
+
+	if (showRemoveButton === null) {
+		showRemoveButton = (disableEditBoxes);
+	}
+
+    let canvas: HTMLCanvasElement;
+	let annotatorContainerDiv: HTMLDivElement;
+	let ctx: CanvasRenderingContext2D;
+    let image = null;
+	let selectedBox = -1;
+	let mode: Mode = Mode.drag;
+	let pointersCache: Map<number, PointerEvent> = new Map();
+	let canvasWindow: WindowViewer = new WindowViewer(draw, pointersCache);
+
+	if (value !== null && value.boxes.length == 0) {
+		mode = Mode.creation;
+	}
+
+	let canvasXmin = 0;
+	let canvasYmin = 0;
+	let canvasXmax = 0;
+	let canvasYmax = 0;
+	let scaleFactor = 1.0;
+
+	let imageWidth = 0;
+	let imageHeight = 0;
+
+	let editModalVisible = false;
+	let newModalVisible = false;
+	let editDefaultLabelVisible = false;
+
+	let labelDetailLock = useDefaultLabel;
+	let defaultLabelCache = {
+		label: "",
+		color: ""
+	};
+
+	let touchScaleValues = {
+		x: 0,
+		y: 0,
+		distance: 0,
+	}
+	const touchScaleDeadzone = 100;
+
+	const dispatch = createEventDispatcher<{
+		change: undefined;
+	}>();
+
+	function colorHexToRGB(hex: string) {
+		var r = parseInt(hex.slice(1, 3), 16),
+			g = parseInt(hex.slice(3, 5), 16),
+			b = parseInt(hex.slice(5, 7), 16);
+		return "rgb(" + r + ", " + g + ", " + b + ")";
+	}
+
+	function colorRGBAToHex(rgba: string) {
+		const rgbaValues = rgba.match(/(\d+(\.\d+)?)/g);
+		const r = parseInt(rgbaValues[0]);
+		const g = parseInt(rgbaValues[1]);
+		const b = parseInt(rgbaValues[2]);
+		const hex = "#" + ((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1);
+		return hex;
+	}
+	
+    function draw() {
+		if (ctx) {
+			ctx.clearRect(0, 0, canvas.width, canvas.height);
+			ctx.save();
+			ctx.translate(canvasWindow.offsetX, canvasWindow.offsetY);
+			ctx.scale(canvasWindow.scale, canvasWindow.scale);
+			if (image !== null){
+				switch (value.orientation) {
+					case 0:
+						ctx.drawImage(image, 0, 0, imageWidth, imageHeight);
+						break;
+					case 1:
+						ctx.translate(imageWidth, 0);
+						ctx.rotate(Math.PI / 2);
+						ctx.drawImage(image, 0, 0, imageHeight, imageWidth);
+						break;
+					case 2:
+						ctx.translate(imageWidth, imageHeight);
+						ctx.rotate(Math.PI);
+						ctx.drawImage(image, 0, 0, imageWidth, imageHeight);
+						break;
+					case 3:
+						ctx.translate(0, imageHeight);
+						ctx.rotate(-Math.PI / 2);
+						ctx.drawImage(image, 0, 0, imageHeight, imageWidth);
+						break;
+				}
+
+				ctx.restore();
+			}
+			
+			for (const box of value.boxes.slice().reverse()) {
+				box.render(ctx);
+			}
+		}
+	}
+
+    function selectBox(index: number) {
+		selectedBox = index;
+		value.boxes.forEach(box => {box.setSelected(false);});
+		if (index >= 0 && index < value.boxes.length){
+			value.boxes[index].setSelected(true);
+		}
+		draw();
+	}
+
+	const getDistance = (touch1: PointerEvent, touch2: PointerEvent) => {
+		const distance = Math.sqrt(
+			Math.pow(touch1.clientX - touch2.clientX, 2) +
+			Math.pow(touch1.clientY - touch2.clientY, 2)
+		);
+		return distance < touchScaleDeadzone ? touchScaleDeadzone : distance;
+	};
+
+	function handlePointerDown(event: PointerEvent) {
+		if (!interactive) {
+			return;
+		}
+
+		event.preventDefault();
+		canvas.setPointerCapture(event.pointerId);
+		pointersCache.set(event.pointerId, event);
+
+		if (pointersCache.size == 1) {
+			if (mode === Mode.creation) {
+				createBox(event);
+			} else if (mode === Mode.drag) {
+				clickBox(event);
+			}
+		} else if (pointersCache.size == 2) {
+			canvasWindow.isDragging = false;
+			value.boxes.forEach(box => {
+				box.isCreating = false;
+				box.isDragging = false;
+				box.isResizing = false;
+			});
+			const pointerArray = Array.from(pointersCache.values());
+			const touch1 = pointerArray[0];
+			const touch2 = pointerArray[1];
+			const distance = getDistance(touch1, touch2);
+			const rect = canvas.getBoundingClientRect();
+			const centerX = (touch1.clientX + touch2.clientX) / 2 - rect.left;
+			const centerY = (touch1.clientY + touch2.clientY) / 2 - rect.top;
+
+			touchScaleValues.distance = distance;
+			touchScaleValues.x = centerX;
+			touchScaleValues.y = centerY;
+		}
+	}
+
+	function clickBox(event: PointerEvent) {
+		const rect = canvas.getBoundingClientRect();
+		const mouseX = event.clientX - rect.left;
+		const mouseY = event.clientY - rect.top;
+		let selectedBoxFlag = false;
+
+		// Check if the mouse is over any of the resizing handles
+		for (const [i, box] of value.boxes.entries()) {
+			const handleIndex = box.indexOfPointInsideHandle(mouseX, mouseY);
+			if (handleIndex >= 0) {
+				selectedBoxFlag = true;
+				selectBox(i);
+				box.startResize(handleIndex, event);
+				return;
+			}
+		}
+
+		// Check if the mouse is inside a box
+		for (const [i, box] of value.boxes.entries()) {
+			if (box.isPointInsideBox(mouseX, mouseY)) {
+				selectedBoxFlag = true;
+				selectBox(i);
+				box.startDrag(event);
+				return;
+			}
+		}
+
+		if (!singleBox) {
+			selectBox(-1);
+		}
+
+		if (!selectedBoxFlag) {
+			canvasWindow.startDrag(event);
+		}
+	}
+
+	function handlePointerUp(event: PointerEvent) {
+		if (!interactive) {
+			return;
+		}
+		pointersCache.delete(event.pointerId);
+		canvas.releasePointerCapture(event.pointerId);
+		dispatch("change");
+	}
+
+	function handlePointerCancel(event: PointerEvent) {
+		if (!interactive) {
+			return;
+		}
+		pointersCache.delete(event.pointerId);
+		canvas.releasePointerCapture(event.pointerId);
+		dispatch("change");
+	}
+
+	function handlePointerMove(event: PointerEvent) {
+		if (!interactive) {
+			return;
+		}
+
+		event.preventDefault();
+		if (event.pointerType === "mouse") {
+			if (!handlesCursor) {
+				return;
+			}
+
+			if (value === null) {
+				return;
+			}
+
+			if (mode !== Mode.drag) {
+				return;
+			}
+
+			const rect = canvas.getBoundingClientRect();
+			const mouseX = event.clientX - rect.left;
+			const mouseY = event.clientY - rect.top;
+
+			for (const [_, box] of value.boxes.entries()) {
+				const handleIndex = box.indexOfPointInsideHandle(mouseX, mouseY);
+				if (handleIndex >= 0) {
+					canvas.style.cursor = box.resizeHandles[handleIndex].cursor;
+					return;
+				}
+			}
+
+			canvas.style.cursor = "default";
+
+		} else { // touch
+			if (!pointersCache.has(event.pointerId)) {
+				return;
+			}
+			pointersCache.set(event.pointerId, event);
+
+			if (pointersCache.size === 2) {
+				const pointerArray = Array.from(pointersCache.values());
+				const touch1 = pointerArray[0];
+				const touch2 = pointerArray[1];
+				const distance = getDistance(touch1, touch2);
+				const rect = canvas.getBoundingClientRect();
+				const centerX = (touch1.clientX + touch2.clientX) / 2 - rect.left;
+				const centerY = (touch1.clientY + touch2.clientY) / 2 - rect.top;
+
+				const newScaleTmp = parseFloat(
+					(canvasWindow.scale * (distance / touchScaleValues.distance)).toFixed(2)
+				);
+				const newScale = newScaleTmp < 1 ? 1 : newScaleTmp;
+
+				const scaleDelta = newScale / canvasWindow.scale;
+				canvasWindow.offsetX = touchScaleValues.x - (touchScaleValues.x - canvasWindow.offsetX) * scaleDelta;
+				canvasWindow.offsetY = touchScaleValues.y - (touchScaleValues.y - canvasWindow.offsetY) * scaleDelta;
+
+				const dx = centerX - touchScaleValues.x;
+				const dy = centerY - touchScaleValues.y;
+				canvasWindow.offsetX += dx;
+				canvasWindow.offsetY += dy;
+				canvasWindow.scale = newScale;
+
+				touchScaleValues.x = centerX;
+				touchScaleValues.y = centerY;
+				touchScaleValues.distance = distance;
+
+				draw();
+			}
+		}
+	}
+
+	function resetView() {
+		// Calculate minimum scale to fit image
+		const scaleX = canvas.width / imageWidth;
+		const scaleY = canvas.height / imageHeight;
+		const minScale = Math.min(scaleX, scaleY);
+				
+		// Set scale and center
+		canvasWindow.scale = minScale;
+		canvasWindow.offsetX = (canvas.width - imageWidth * minScale) / 2;
+		canvasWindow.offsetY = (canvas.height - imageHeight * minScale) / 2;
+		
+		draw();
+	}
+
+	function handleKeyPress(event: KeyboardEvent) {
+		if (!enableKeyboardShortcuts || event.target !== annotatorContainerDiv || !interactive) {
+			return;
+		}
+		
+		const key = event.key.toLowerCase();
+		const blockedKeys = new Set(['delete', 'c', 'd', 'e', ' ']);
+
+		if (blockedKeys.has(key)) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+		
+		switch (key) {
+			case 'delete': onDeleteBox(); break;
+			case 'c': setCreateMode(); break;
+			case 'd': setDragMode(); break;
+			case 'e': onEditBox(); break;
+			case ' ': resetView(); break;
+		}
+	}
+
+	function focusAnnotator() {
+		setTimeout(() => {annotatorContainerDiv?.focus();}, 0);
+	}
+
+	function handleMouseWheel(event: WheelEvent) {
+		if (!interactive) {
+			return;
+		}
+
+		event.preventDefault();
+		const delta = 1 / (1 + (event.deltaY / 1000) * 0.5);
+
+		const newScaleTmp = parseFloat((canvasWindow.scale * delta).toFixed(2));
+		const newScale = newScaleTmp < 1 ? 1 : newScaleTmp;
+		const rect = canvas.getBoundingClientRect();
+		const mouseX = event.clientX - rect.left;
+		const mouseY = event.clientY - rect.top;
+
+		const worldX = (mouseX - canvasWindow.offsetX) / canvasWindow.scale;
+		const worldY = (mouseY - canvasWindow.offsetY) / canvasWindow.scale;
+
+		canvasWindow.offsetX = mouseX - worldX * newScale;
+		canvasWindow.offsetY = mouseY - worldY * newScale;
+
+		canvasWindow.scale = newScale;
+		draw();
+	}
+
+	function createBox(event: PointerEvent) {
+		const rect = canvas.getBoundingClientRect();
+		const x = (event.clientX - rect.left - canvasWindow.offsetX) / scaleFactor / canvasWindow.scale;
+		const y = (event.clientY - rect.top - canvasWindow.offsetY) / scaleFactor / canvasWindow.scale;
+		let color;
+		if (choicesColors.length > 0) {
+			color = colorHexToRGB(choicesColors[0]);
+		} else if (singleBox) {
+			if (value.boxes.length > 0) {
+				color = value.boxes[0].color;
+			} else {
+				color = Colors[0];
+			}
+		} else {
+			color = Colors[value.boxes.length % Colors.length];
+		}
+		
+		let box = new Box(
+			draw,
+			onBoxFinishCreation,
+			canvasWindow,
+			pointersCache,
+			canvasXmin,
+			canvasYmin,
+			canvasXmax,
+			canvasYmax,
+			"",
+			x,
+			y,
+			x,
+			y,
+			color,
+			boxAlpha,
+			boxMinSize,
+			handleSize,
+			boxThickness,
+			boxSelectedThickness
+		);
+		box.startCreating(event, rect.left, rect.top);
+		if (singleBox) {
+			value.boxes = [box];
+		} else {
+			value.boxes = [box, ...value.boxes];
+		}
+		selectBox(0);
+		draw();
+		dispatch("change");
+	}
+
+	function setCreateMode() {
+		mode = Mode.creation;
+		canvas.style.cursor = "crosshair";
+	}
+
+	function setDragMode() {
+		mode = Mode.drag;
+		canvas.style.cursor = "default";
+	}
+
+	function onBoxFinishCreation() {
+		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
+			if (value.boxes[selectedBox].getArea() < 1) {
+				onDeleteBox();
+			} else {
+				if (!disableEditBoxes) {
+					if (labelDetailLock) {
+						onUseDefaultLabelModalNew();
+					} else{
+						newModalVisible = true;
+					}
+				}
+				if (singleBox) {
+					setDragMode();
+				}
+			}
+		}
+	}
+
+	function onEditBox() {
+		if (selectedBox >= 0 && selectedBox < value.boxes.length && !disableEditBoxes) {
+			editModalVisible = true;
+		}
+	}
+
+	function handleDoubleClick(event: MouseEvent){
+		if (!interactive) {
+			return;
+		}
+		
+		onEditBox();
+	}
+
+	function onModalEditChange(event) {
+		editModalVisible = false;
+		focusAnnotator();
+		const { detail } = event;
+		let label = detail.label;
+		let color = detail.color;
+		let ret = detail.ret;
+		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
+			let box = value.boxes[selectedBox];
+			if (ret == 1) {
+				box.label = label;
+				box.color = colorHexToRGB(color);
+				draw();
+				dispatch("change");
+			} else if (ret == -1) {
+				onDeleteBox();
+			}
+		}
+	}
+
+	function onModalNewChange(event) {
+		newModalVisible = false;
+		focusAnnotator();
+		const { detail } = event;
+		let label = detail.label;
+		let color = detail.color;
+		let ret = detail.ret;
+		let lock = detail.lock;
+		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
+			let box = value.boxes[selectedBox];
+			if (ret == 1) {
+				labelDetailLock = lock;
+				defaultLabelCache.label = label;
+				defaultLabelCache.color = color;
+				box.label = label;
+				box.color = colorHexToRGB(color);
+				draw();
+				dispatch("change");
+			} else {
+				onDeleteBox();
+			}
+		}
+	}
+
+	function onDefaultLabelEditChange(event) {
+		editDefaultLabelVisible = false;
+		focusAnnotator();
+		const { detail } = event;
+		let label = detail.label;
+		let color = detail.color;
+		let ret = detail.ret;
+		let lock = detail.lock;
+		if (ret == 1) {
+			labelDetailLock = lock;
+			defaultLabelCache.label = label;
+			defaultLabelCache.color = color;
+		}
+	}
+
+	function onUseDefaultLabelModalNew(){
+		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
+			let box = value.boxes[selectedBox];
+			box.label = defaultLabelCache.label;
+			if (defaultLabelCache.color !== "") {
+				box.color = colorHexToRGB(defaultLabelCache.color);
+			}
+			draw();
+			dispatch("change");
+		}
+	}
+
+    function onDeleteBox() {
+		if (selectedBox >= 0 && selectedBox < value.boxes.length) {
+			value.boxes.splice(selectedBox, 1);
+			selectBox(-1);
+			if (singleBox) {
+				setCreateMode();
+			}
+			dispatch("change");
+		}
+	}
+	
+	/**
+	 * Rotate the image and all the boxes
+	 * @param op 1: rotate clockwise, -1: rotate counterclockwise
+	 */
+	function onRotateImage(op: number) {
+		value.orientation = (((value.orientation + op) % 4) + 4 ) % 4;
+		canvasWindow.orientation = value.orientation;
+
+		resize();
+		for (const box of value.boxes) {
+			box.onRotate(op);
+		}
+		draw();
+	}
+
+	function resize() {
+		if (canvas) {
+			scaleFactor = 1;
+			canvas.width = canvas.clientWidth;
+
+			canvasWindow.setRotatedImage(image);
+			
+			if (image !== null) {
+				if (canvasWindow.imageRotatedWidth > canvas.width) {
+					scaleFactor = canvas.width / canvasWindow.imageRotatedWidth;
+					imageWidth = Math.round(canvasWindow.imageRotatedWidth * scaleFactor);
+					imageHeight = Math.round(canvasWindow.imageRotatedHeight * scaleFactor);
+					canvasXmin = 0;
+					canvasYmin = 0;
+					canvasXmax = imageWidth;
+					canvasYmax = imageHeight;
+					canvas.height = imageHeight;
+				} else {
+					imageWidth = canvasWindow.imageRotatedWidth;
+					imageHeight = canvasWindow.imageRotatedHeight;
+					var x = (canvas.width - imageWidth) / 2;
+					canvasXmin = x;
+					canvasYmin = 0;
+					canvasXmax = x + imageWidth;
+					canvasYmax = imageHeight;
+					canvas.height = imageHeight;
+				}
+
+				canvasWindow.imageWidth = imageWidth;
+				canvasWindow.imageHeight = imageHeight;
+
+			} else {
+				canvasXmin = 0;
+				canvasYmin = 0;
+				canvasXmax = canvas.width;
+				canvasYmax = canvas.height;
+				canvas.height = canvas.clientHeight;
+			}
+			
+			canvasWindow.resize(canvas.width, canvas.height, canvasXmin, canvasYmin);
+
+			if (canvasXmax > 0 && canvasYmax > 0){
+				for (const box of value.boxes) {
+					box.canvasXmin = canvasXmin;
+					box.canvasYmin = canvasYmin;
+					box.canvasXmax = canvasXmax;
+					box.canvasYmax = canvasYmax;
+					box.setScaleFactor(scaleFactor);
+				}
+			}
+			draw();
+			dispatch("change");
+		}
+	}
+	const observer = new ResizeObserver(resize);
+
+	function parseInputBoxes() {
+		for (let i = 0; i < value.boxes.length; i++) {
+			let box = value.boxes[i];
+			if (!(box instanceof Box)) {
+				let color = "";
+				let label = "";
+				if (box.hasOwnProperty("color")) {
+					color = box["color"];
+					if (Array.isArray(color) && color.length === 3) {
+            			color = `rgb(${color[0]}, ${color[1]}, ${color[2]})`;
+        			}
+				} else {
+					color = Colors[i % Colors.length];
+				}
+				if (box.hasOwnProperty("label")) {
+					label = box["label"];
+				}
+				box = new Box(
+					draw,
+					onBoxFinishCreation,
+					canvasWindow,
+					pointersCache,
+					canvasXmin,
+					canvasYmin,
+					canvasXmax,
+					canvasYmax,
+					label,
+					box["xmin"],
+					box["ymin"],
+					box["xmax"],
+					box["ymax"],
+					color,
+					boxAlpha,
+					boxMinSize,
+					handleSize,
+					boxThickness,
+					boxSelectedThickness
+				);
+				value.boxes[i] = box;
+			}
+		}
+	}
+
+	$: {
+		value;
+		canvasWindow.orientation = value.orientation;
+		setImage();
+		parseInputBoxes();
+		resize();
+		draw();
+	}
+
+	function setImage(){
+		if (imageUrl !== null) {
+			if (image === null || image.src != imageUrl) {
+				image = new Image();
+				image.src = imageUrl;
+				image.onload = function(){
+					resize();
+					draw();
+				}
+			}
+		}
+	}
+
+	onMount(() => {
+		if (Array.isArray(choices) && choices.length > 0) {
+			if (!Array.isArray(choicesColors) || choicesColors.length == 0) {
+				for (let i = 0; i < choices.length; i++) {
+					let color = Colors[i % Colors.length];
+					choicesColors.push(colorRGBAToHex(color));
+				}
+			}
+			defaultLabelCache.label = choices[0][0];
+			defaultLabelCache.color = choicesColors[0];
+		}
+
+		ctx = canvas.getContext("2d");
+		observer.observe(canvas);
+
+		if (selectedBox < 0 && value !== null && value.boxes.length > 0) {
+			selectBox(0);
+		}
+		
+		setImage();
+		resize();
+		draw();
+	});
+
+</script>
+
+<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<div
+	class="annotator-container"
+	tabindex="0"
+	bind:this={annotatorContainerDiv}
+	on:keydown={handleKeyPress}
+	on:click={() => annotatorContainerDiv.focus()}
+>
+	<div class="canvas-container">
+		<canvas
+			bind:this={canvas}
+			on:pointerdown={handlePointerDown}
+			on:pointerup={handlePointerUp}
+			on:pointermove={handlePointerMove}
+			on:pointercancel={handlePointerCancel}
+			on:dblclick={handleDoubleClick}
+			on:wheel={handleMouseWheel}
+			style="height: {height}; width: {width};"
+			class="canvas-annotator"
+		></canvas>
+	</div>
+
+	{#if interactive}
+		<span class="canvas-control">
+			<button
+				class="icon"
+				class:selected={mode === Mode.creation}
+				aria-label="Create box"
+				title="Create box (C)"
+				on:click={() => setCreateMode()}><BoundingBox/></button
+			>
+			<button
+				class="icon"
+				class:selected={mode === Mode.drag}
+				aria-label="Drag boxes"
+				title="Drag boxes (D)"
+				on:click={() => setDragMode()}><Hand/></button
+			>
+			{#if showRemoveButton}
+				<button
+					class="icon"
+					aria-label="Remove box"
+					title="Remove box (Del)"
+					on:click={() => onDeleteBox()}><Trash/></button
+				>
+			{/if}
+			{#if !disableEditBoxes && labelDetailLock}
+				<button
+					class="icon"
+					aria-label="Edit label"
+					title="Edit label"
+					on:click={() => editDefaultLabelVisible = true}><Label/></button
+				>
+			{/if}
+			<button
+				class="icon"
+				aria-label="Rotate counterclockwise"
+				title="Rotate counterclockwise"
+				on:click={() => onRotateImage(-1)}><Undo/></button
+			>
+			<button
+				class="icon"
+				aria-label="Rotate clockwise"
+				title="Rotate clockwise"
+				on:click={() => onRotateImage(1)}><Redo/></button
+			>
+		</span>
+	{/if}
+</div>
+
+{#if editModalVisible}
+	<ModalBox
+		on:change={onModalEditChange}
+		on:enter{onModalEditChange}
+		choices={choices}
+		choicesColors={choicesColors}
+		label={selectedBox >= 0 && selectedBox < value.boxes.length ? value.boxes[selectedBox].label : ""}
+		color={selectedBox >= 0 && selectedBox < value.boxes.length ? colorRGBAToHex(value.boxes[selectedBox].color) : ""}
+	/>
+{/if}
+
+{#if newModalVisible}
+	<ModalBox
+		on:change={onModalNewChange}
+		on:enter{onModalNewChange}
+		choices={choices}
+		showRemove={false}
+		choicesColors={choicesColors}
+		label={selectedBox >= 0 && selectedBox < value.boxes.length ? value.boxes[selectedBox].label : ""}
+		color={selectedBox >= 0 && selectedBox < value.boxes.length ? colorRGBAToHex(value.boxes[selectedBox].color) : ""}
+		labelDetailLock = {labelDetailLock}
+	/>
+{/if}
+
+{#if editDefaultLabelVisible}
+	<ModalBox
+		on:change={onDefaultLabelEditChange}
+		on:enter{onDefaultLabelEditChange}
+		choices={choices}
+		showRemove={false}
+		choicesColors={choicesColors}
+		label={selectedBox >= 0 && selectedBox < value.boxes.length ? value.boxes[selectedBox].label : ""}
+		color={selectedBox >= 0 && selectedBox < value.boxes.length ? colorRGBAToHex(value.boxes[selectedBox].color) : ""}
+		labelDetailLock = {labelDetailLock}
+	/>
+{/if}
+
+<style>
+	.canvas-annotator {
+		border-color: var(--block-border-color);
+		width: 100%;
+		height: 100%;
+		display: block;
+		touch-action: none;
+	}
+
+	.canvas-control {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-top: 1px solid var(--border-color-primary);
+		width: 95%;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		margin-left: auto;
+		margin-right: auto;
+		margin-top: var(--size-2);
+	}
+
+	.icon {
+		width: 22px;
+		height: 22px;
+		margin: var(--spacing-lg) var(--spacing-xs);
+		padding: var(--spacing-xs);
+		color: var(--neutral-400);
+		border-radius: var(--radius-md);
+	}
+
+	.icon:hover,
+	.icon:focus {
+		color: var(--color-accent);
+	}
+	
+	.selected {
+		color: var(--color-accent);
+	}
+
+	.canvas-container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.canvas-container:focus {
+    	outline: none;
+	}
+</style>

src/frontend/shared/ClearImage.svelte

@@ -1,30 +1,30 @@
-<script lang="ts">
-	import { createEventDispatcher } from "svelte";
-	import { IconButton } from "@gradio/atoms";
-	import { Clear } from "@gradio/icons";
-
-	const dispatch = createEventDispatcher();
-</script>
-
-<div>
-	<IconButton
-		Icon={Clear}
-		label="Remove Image"
-		on:click={(event) => {
-			dispatch("remove_image");
-			event.stopPropagation();
-		}}
-	/>
-</div>
-
-<style>
-	div {
-		display: flex;
-		position: absolute;
-		top: var(--size-2);
-		right: var(--size-2);
-		justify-content: flex-end;
-		gap: var(--spacing-sm);
-		z-index: var(--layer-5);
-	}
-</style>
+<script lang="ts">
+	import { createEventDispatcher } from "svelte";
+	import { IconButton } from "@gradio/atoms";
+	import { Clear } from "@gradio/icons";
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<div>
+	<IconButton
+		Icon={Clear}
+		label="Remove Image"
+		on:click={(event) => {
+			dispatch("remove_image");
+			event.stopPropagation();
+		}}
+	/>
+</div>
+
+<style>
+	div {
+		display: flex;
+		position: absolute;
+		top: var(--size-2);
+		right: var(--size-2);
+		justify-content: flex-end;
+		gap: var(--spacing-sm);
+		z-index: var(--layer-5);
+	}
+</style>

src/frontend/shared/Colors.js

@@ -1,15 +1,15 @@
-export const Colors = [
-    "rgb(255, 168, 77)",
-    "rgb(92, 172, 238)",
-    "rgb(255, 99, 71)",
-    "rgb(118, 238, 118)",
-    "rgb(255, 145, 164)",
-    "rgb(0, 191, 255)",
-    "rgb(255, 218, 185)",
-    "rgb(255, 69, 0)",
-    "rgb(34, 139, 34)",
-    "rgb(255, 240, 245)",
-    "rgb(255, 193, 37)",
-    "rgb(255, 193, 7)",
-    "rgb(255, 250, 138)",
-];
+export const Colors = [
+    "rgb(255, 168, 77)",
+    "rgb(92, 172, 238)",
+    "rgb(255, 99, 71)",
+    "rgb(118, 238, 118)",
+    "rgb(255, 145, 164)",
+    "rgb(0, 191, 255)",
+    "rgb(255, 218, 185)",
+    "rgb(255, 69, 0)",
+    "rgb(34, 139, 34)",
+    "rgb(255, 240, 245)",
+    "rgb(255, 193, 37)",
+    "rgb(255, 193, 7)",
+    "rgb(255, 250, 138)",
+];

src/frontend/shared/ImageAnnotator.svelte

@@ -1,248 +1,248 @@
-<script lang="ts">
-	import { createEventDispatcher, tick } from "svelte";
-	import { Download, Image as ImageIcon } from "@gradio/icons";
-	import { DownloadLink } from "@gradio/wasm/svelte";
-	import { uploadToHuggingFace } from "@gradio/utils";
-	import { BlockLabel, IconButton, ShareButton, SelectSource} from "@gradio/atoms";
-	import { Upload } from "@gradio/upload";
-	import { Webcam } from "@gradio/image";
-	import type { FileData, Client } from "@gradio/client";
-	import type { I18nFormatter, SelectData } from "@gradio/utils";
-	import { Clear } from "@gradio/icons";
-	import ImageCanvas from "./ImageCanvas.svelte";
-	import AnnotatedImageData from "./AnnotatedImageData";
-
-	type source_type = "upload" | "webcam" | "clipboard" | null;
-
-	export let value: null | AnnotatedImageData;
-	export let label: string | undefined = undefined;
-	export let show_label: boolean;
-	export let sources: source_type[] = ["upload", "webcam", "clipboard"];
-	export let selectable = false;
-	export let root: string;
-	export let interactive: boolean;
-	export let i18n: I18nFormatter;
-	export let showShareButton: boolean;
-	export let showDownloadButton: boolean;
-	export let showClearButton: boolean;
-	export let boxesAlpha;
-	export let labelList: string[];
-	export let labelColors: string[];
-	export let boxMinSize: number;
-	export let handleSize: number;
-	export let height: number | string;
-	export let width: number | string;
-	export let boxThickness: number;
-	export let disableEditBoxes: boolean;
-	export let singleBox: boolean;
-	export let showRemoveButton: boolean;
-	export let handlesCursor: boolean;
-	export let boxSelectedThickness: number;
-	export let max_file_size: number | null = null;
-	export let cli_upload: Client["upload"];
-	export let stream_handler: Client["stream_factory"];
-	export let useDefaultLabel: boolean;
-	export let enableKeyboardShortcuts: boolean;
-
-	let upload: Upload;
-	let uploading = false;
-	export let active_source: source_type = null;
-
-	function handle_upload({ detail }: CustomEvent<FileData>): void {
-		value = new AnnotatedImageData();
-		value.image = detail;
-		dispatch("upload");
-	}
-
-	async function handle_save(img_blob: Blob | any): Promise<void> {
-		const f = await upload.load_files([new File([img_blob], `webcam.png`)]);
-		const image = f?.[0] || null;
-		if (image) {
-			value = new AnnotatedImageData();
-			value.image = image;
-		} else {
-			value = null;
-		}
-		await tick();
-		dispatch("change");
-	}
-
-	$: if (uploading) clear();
-
-	const dispatch = createEventDispatcher<{
-		change: undefined;
-		clear: undefined;
-		drag: boolean;
-		upload?: never;
-		select: SelectData;
-	}>();
-
-	let dragging = false;
-
-	$: dispatch("drag", dragging);
-
-	$: if (!active_source && sources) {
-		active_source = sources[0];
-	}
-
-	async function handle_select_source(
-		source: (typeof sources)[number]
-	): Promise<void> {
-		switch (source) {
-			case "clipboard":
-				upload.paste_clipboard();
-				break;
-			default:
-				break;
-		}
-	}
-
-	function clear() {
-		value = null;
-		dispatch("clear");
-		dispatch("change");
-	}
-</script>
-
-<BlockLabel {show_label} Icon={ImageIcon} label={label || "Image Annotator"} />
-
-<div class="icon-buttons">
-	{#if showDownloadButton && value !== null}
-		<DownloadLink href={value.image.url} download={value.image.orig_name || "image"}>
-			<IconButton Icon={Download} label={i18n("common.download")} />
-		</DownloadLink>
-	{/if}
-	{#if showShareButton && value !== null}
-		<ShareButton
-			{i18n}
-			on:share
-			on:error
-			formatter={async (value) => {
-				if (value === null) return "";
-				let url = await uploadToHuggingFace(value.image, "base64");
-				return `<img src="${url}" />`;
-			}}
-			{value}
-		/>
-	{/if}
-	{#if showClearButton && value !== null && interactive}
-		<div>
-			<IconButton
-				Icon={Clear}
-				label="Remove Image"
-				on:click={clear}
-			/>
-		</div>
-	{/if}
-</div>
-
-<div data-testid="image" class="image-container">
-	<div class="upload-container">
-		<Upload
-			hidden={value !== null || active_source === "webcam"}
-			bind:this={upload}
-			bind:uploading
-			bind:dragging
-			filetype={active_source === "clipboard" ? "clipboard" : "image/*"}
-			on:load={handle_upload}
-			on:error
-			{root}
-			{max_file_size}
-			disable_click={!sources.includes("upload")}
-			upload={cli_upload}
-			{stream_handler}
-		>
-			{#if value === null}
-				<slot />
-			{/if}
-		</Upload>
-		{#if value === null && active_source === "webcam"}
-			<Webcam
-				{root}
-				on:capture={(e) => handle_save(e.detail)}
-				on:stream={(e) => handle_save(e.detail)}
-				on:error
-				on:drag
-				on:upload={(e) => handle_save(e.detail)}
-				mode="image"
-				include_audio={false}
-				{i18n}
-				{upload}
-			/>
-		{/if}
-		{#if value !== null}
-			<div class:selectable class="image-frame">
-				<ImageCanvas
-					bind:value
-					on:change={() => dispatch("change")}
-					{height}
-					{width}
-					{boxesAlpha}
-					{labelList}
-					{labelColors}
-					{boxMinSize}
-					{interactive}
-					{handleSize}
-					{boxThickness}
-					{singleBox}
-					{disableEditBoxes}
-					{showRemoveButton}
-					{handlesCursor}
-					{boxSelectedThickness}
-					{useDefaultLabel}
-					{enableKeyboardShortcuts}
-					src={value.image.url}
-				/>
-			</div>
-		{/if}
-	</div>
-	{#if (sources.length > 1 || sources.includes("clipboard")) && value === null && interactive}
-		<SelectSource
-			{sources}
-			bind:active_source
-			handle_clear={clear}
-			handle_select={handle_select_source}
-		/>
-	{/if}
-</div>
-
-<style>
-	.image-frame :global(img) {
-		width: var(--size-full);
-		height: var(--size-full);
-		object-fit: cover;
-	}
-
-	.image-frame {
-		object-fit: cover;
-		width: 100%;
-	}
-
-	.upload-container {
-		height: 100%;
-		width: 100%;
-		flex-shrink: 1;
-		max-height: 100%;
-	}
-
-	.image-container {
-		display: flex;
-		height: 100%;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		max-height: 100%;
-	}
-
-	.selectable {
-		cursor: crosshair;
-	}
-
-	.icon-buttons {
-		display: flex;
-		position: absolute;
-		top: 6px;
-		right: 6px;
-		gap: var(--size-1);
-	}
-</style>
+<script lang="ts">
+	import { createEventDispatcher, tick } from "svelte";
+	import { Download, Image as ImageIcon } from "@gradio/icons";
+	import { DownloadLink } from "@gradio/wasm/svelte";
+	import { uploadToHuggingFace } from "@gradio/utils";
+	import { BlockLabel, IconButton, ShareButton, SelectSource} from "@gradio/atoms";
+	import { Upload } from "@gradio/upload";
+	import { Webcam } from "@gradio/image";
+	import type { FileData, Client } from "@gradio/client";
+	import type { I18nFormatter, SelectData } from "@gradio/utils";
+	import { Clear } from "@gradio/icons";
+	import ImageCanvas from "./ImageCanvas.svelte";
+	import AnnotatedImageData from "./AnnotatedImageData";
+
+	type source_type = "upload" | "webcam" | "clipboard" | null;
+
+	export let value: null | AnnotatedImageData;
+	export let label: string | undefined = undefined;
+	export let show_label: boolean;
+	export let sources: source_type[] = ["upload", "webcam", "clipboard"];
+	export let selectable = false;
+	export let root: string;
+	export let interactive: boolean;
+	export let i18n: I18nFormatter;
+	export let showShareButton: boolean;
+	export let showDownloadButton: boolean;
+	export let showClearButton: boolean;
+	export let boxesAlpha;
+	export let labelList: string[];
+	export let labelColors: string[];
+	export let boxMinSize: number;
+	export let handleSize: number;
+	export let height: number | string;
+	export let width: number | string;
+	export let boxThickness: number;
+	export let disableEditBoxes: boolean;
+	export let singleBox: boolean;
+	export let showRemoveButton: boolean;
+	export let handlesCursor: boolean;
+	export let boxSelectedThickness: number;
+	export let max_file_size: number | null = null;
+	export let cli_upload: Client["upload"];
+	export let stream_handler: Client["stream_factory"];
+	export let useDefaultLabel: boolean;
+	export let enableKeyboardShortcuts: boolean;
+
+	let upload: Upload;
+	let uploading = false;
+	export let active_source: source_type = null;
+
+	function handle_upload({ detail }: CustomEvent<FileData>): void {
+		value = new AnnotatedImageData();
+		value.image = detail;
+		dispatch("upload");
+	}
+
+	async function handle_save(img_blob: Blob | any): Promise<void> {
+		const f = await upload.load_files([new File([img_blob], `webcam.png`)]);
+		const image = f?.[0] || null;
+		if (image) {
+			value = new AnnotatedImageData();
+			value.image = image;
+		} else {
+			value = null;
+		}
+		await tick();
+		dispatch("change");
+	}
+
+	$: if (uploading) clear();
+
+	const dispatch = createEventDispatcher<{
+		change: undefined;
+		clear: undefined;
+		drag: boolean;
+		upload?: never;
+		select: SelectData;
+	}>();
+
+	let dragging = false;
+
+	$: dispatch("drag", dragging);
+
+	$: if (!active_source && sources) {
+		active_source = sources[0];
+	}
+
+	async function handle_select_source(
+		source: (typeof sources)[number]
+	): Promise<void> {
+		switch (source) {
+			case "clipboard":
+				upload.paste_clipboard();
+				break;
+			default:
+				break;
+		}
+	}
+
+	function clear() {
+		value = null;
+		dispatch("clear");
+		dispatch("change");
+	}
+</script>
+
+<BlockLabel {show_label} Icon={ImageIcon} label={label || "Image Annotator"} />
+
+<div class="icon-buttons">
+	{#if showDownloadButton && value !== null}
+		<DownloadLink href={value.image.url} download={value.image.orig_name || "image"}>
+			<IconButton Icon={Download} label={i18n("common.download")} />
+		</DownloadLink>
+	{/if}
+	{#if showShareButton && value !== null}
+		<ShareButton
+			{i18n}
+			on:share
+			on:error
+			formatter={async (value) => {
+				if (value === null) return "";
+				let url = await uploadToHuggingFace(value.image, "base64");
+				return `<img src="${url}" />`;
+			}}
+			{value}
+		/>
+	{/if}
+	{#if showClearButton && value !== null && interactive}
+		<div>
+			<IconButton
+				Icon={Clear}
+				label="Remove Image"
+				on:click={clear}
+			/>
+		</div>
+	{/if}
+</div>
+
+<div data-testid="image" class="image-container">
+	<div class="upload-container">
+		<Upload
+			hidden={value !== null || active_source === "webcam"}
+			bind:this={upload}
+			bind:uploading
+			bind:dragging
+			filetype={active_source === "clipboard" ? "clipboard" : "image/*"}
+			on:load={handle_upload}
+			on:error
+			{root}
+			{max_file_size}
+			disable_click={!sources.includes("upload")}
+			upload={cli_upload}
+			{stream_handler}
+		>
+			{#if value === null}
+				<slot />
+			{/if}
+		</Upload>
+		{#if value === null && active_source === "webcam"}
+			<Webcam
+				{root}
+				on:capture={(e) => handle_save(e.detail)}
+				on:stream={(e) => handle_save(e.detail)}
+				on:error
+				on:drag
+				on:upload={(e) => handle_save(e.detail)}
+				mode="image"
+				include_audio={false}
+				{i18n}
+				{upload}
+			/>
+		{/if}
+		{#if value !== null}
+			<div class:selectable class="image-frame">
+				<ImageCanvas
+					bind:value
+					on:change={() => dispatch("change")}
+					{height}
+					{width}
+					{boxesAlpha}
+					{labelList}
+					{labelColors}
+					{boxMinSize}
+					{interactive}
+					{handleSize}
+					{boxThickness}
+					{singleBox}
+					{disableEditBoxes}
+					{showRemoveButton}
+					{handlesCursor}
+					{boxSelectedThickness}
+					{useDefaultLabel}
+					{enableKeyboardShortcuts}
+					src={value.image.url}
+				/>
+			</div>
+		{/if}
+	</div>
+	{#if (sources.length > 1 || sources.includes("clipboard")) && value === null && interactive}
+		<SelectSource
+			{sources}
+			bind:active_source
+			handle_clear={clear}
+			handle_select={handle_select_source}
+		/>
+	{/if}
+</div>
+
+<style>
+	.image-frame :global(img) {
+		width: var(--size-full);
+		height: var(--size-full);
+		object-fit: cover;
+	}
+
+	.image-frame {
+		object-fit: cover;
+		width: 100%;
+	}
+
+	.upload-container {
+		height: 100%;
+		width: 100%;
+		flex-shrink: 1;
+		max-height: 100%;
+	}
+
+	.image-container {
+		display: flex;
+		height: 100%;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		max-height: 100%;
+	}
+
+	.selectable {
+		cursor: crosshair;
+	}
+
+	.icon-buttons {
+		display: flex;
+		position: absolute;
+		top: 6px;
+		right: 6px;
+		gap: var(--size-1);
+	}
+</style>

src/frontend/shared/ImageCanvas.svelte

@@ -1,80 +1,80 @@
-<script lang="ts">
-	import { resolve_wasm_src } from "@gradio/wasm/svelte";
-	import type { HTMLImgAttributes } from "svelte/elements";
-    import { createEventDispatcher } from "svelte";
-	import Canvas from "./Canvas.svelte"
-	import AnnotatedImageData from "./AnnotatedImageData";
-
-	interface Props extends HTMLImgAttributes {
-		"data-testid"?: string;
-	}
-
-	export let src: HTMLImgAttributes["src"] = undefined;
-	export let interactive: boolean;
-	export let boxesAlpha: number;
-	export let labelList: string[];
-	export let labelColors: string[];
-	export let boxMinSize: number;
-	export let handleSize: number;
-	export let boxThickness: number;
-	export let height: number | string;
-	export let width: number | string;
-	export let boxSelectedThickness: number;
-	export let value: null | AnnotatedImageData;
-	export let disableEditBoxes: boolean;
-	export let singleBox: boolean;
-	export let showRemoveButton: boolean;
-	export let handlesCursor: boolean;
-	export let useDefaultLabel: boolean;
-	export let enableKeyboardShortcuts: boolean;
-
-	let resolved_src: typeof src;
-
-	// The `src` prop can be updated before the Promise from `resolve_wasm_src` is resolved.
-	// In such a case, the resolved value for the old `src` has to be discarded,
-	// This variable `latest_src` is used to pick up only the value resolved for the latest `src` prop.
-	let latest_src: typeof src;
-	$: {
-		// In normal (non-Wasm) Gradio, the `<img>` element should be rendered with the passed `src` props immediately
-		// without waiting for `resolve_wasm_src()` to resolve.
-		// If it waits, a blank image is displayed until the async task finishes
-		// and it leads to undesirable flickering.
-		// So set `src` to `resolved_src` here.
-		resolved_src = src;
-
-		latest_src = src;
-		const resolving_src = src;
-		resolve_wasm_src(resolving_src).then((s) => {
-			if (latest_src === resolving_src) {
-				resolved_src = s;
-			}
-		});
-	}
-
-	const dispatch = createEventDispatcher<{
-		change: undefined;
-	}>();
-
-</script>
-
-<Canvas
-	bind:value
-	on:change={() => dispatch("change")}
-	{interactive}
-	boxAlpha={boxesAlpha}
-	choices={labelList}
-	choicesColors={labelColors}
-	{height}
-	{width}
-	{boxMinSize}
-	{handleSize}
-	{boxThickness}
-	{boxSelectedThickness}
-	{disableEditBoxes}
-	{singleBox}
-	{showRemoveButton}
-	{handlesCursor}
-	{useDefaultLabel}
-	{enableKeyboardShortcuts}
-	imageUrl={resolved_src}
-/>
+<script lang="ts">
+	import { resolve_wasm_src } from "@gradio/wasm/svelte";
+	import type { HTMLImgAttributes } from "svelte/elements";
+    import { createEventDispatcher } from "svelte";
+	import Canvas from "./Canvas.svelte"
+	import AnnotatedImageData from "./AnnotatedImageData";
+
+	interface Props extends HTMLImgAttributes {
+		"data-testid"?: string;
+	}
+
+	export let src: HTMLImgAttributes["src"] = undefined;
+	export let interactive: boolean;
+	export let boxesAlpha: number;
+	export let labelList: string[];
+	export let labelColors: string[];
+	export let boxMinSize: number;
+	export let handleSize: number;
+	export let boxThickness: number;
+	export let height: number | string;
+	export let width: number | string;
+	export let boxSelectedThickness: number;
+	export let value: null | AnnotatedImageData;
+	export let disableEditBoxes: boolean;
+	export let singleBox: boolean;
+	export let showRemoveButton: boolean;
+	export let handlesCursor: boolean;
+	export let useDefaultLabel: boolean;
+	export let enableKeyboardShortcuts: boolean;
+
+	let resolved_src: typeof src;
+
+	// The `src` prop can be updated before the Promise from `resolve_wasm_src` is resolved.
+	// In such a case, the resolved value for the old `src` has to be discarded,
+	// This variable `latest_src` is used to pick up only the value resolved for the latest `src` prop.
+	let latest_src: typeof src;
+	$: {
+		// In normal (non-Wasm) Gradio, the `<img>` element should be rendered with the passed `src` props immediately
+		// without waiting for `resolve_wasm_src()` to resolve.
+		// If it waits, a blank image is displayed until the async task finishes
+		// and it leads to undesirable flickering.
+		// So set `src` to `resolved_src` here.
+		resolved_src = src;
+
+		latest_src = src;
+		const resolving_src = src;
+		resolve_wasm_src(resolving_src).then((s) => {
+			if (latest_src === resolving_src) {
+				resolved_src = s;
+			}
+		});
+	}
+
+	const dispatch = createEventDispatcher<{
+		change: undefined;
+	}>();
+
+</script>
+
+<Canvas
+	bind:value
+	on:change={() => dispatch("change")}
+	{interactive}
+	boxAlpha={boxesAlpha}
+	choices={labelList}
+	choicesColors={labelColors}
+	{height}
+	{width}
+	{boxMinSize}
+	{handleSize}
+	{boxThickness}
+	{boxSelectedThickness}
+	{disableEditBoxes}
+	{singleBox}
+	{showRemoveButton}
+	{handlesCursor}
+	{useDefaultLabel}
+	{enableKeyboardShortcuts}
+	imageUrl={resolved_src}
+/>

src/frontend/shared/ModalBox.svelte

@@ -1,189 +1,189 @@
-<script lang="ts">
-	import { BaseColorPicker } from "@gradio/colorpicker";
-    import { BaseButton } from "@gradio/button";
-    import { BaseDropdown } from "./patched_dropdown/Index.svelte";
-	import { createEventDispatcher } from "svelte";
-    import { onMount } from "svelte";
-    import { Lock, Unlock } from "./icons/index";
-
-    export let label = "";
-    export let currentLabel = "";
-    export let choices = [];  // [(label, i)]
-    export let choicesColors = [];
-    export let color = "";
-    export let currentColor = "";
-    export let showRemove = true;
-    export let labelDetailLock = false;
-    
-    const dispatch = createEventDispatcher<{
-		change: object;
-	}>();
-
-    function dispatchChange(ret: number) {
-        dispatch("change", {
-            label: currentLabel,
-            color: currentColor,
-            lock: labelDetailLock,
-            ret: ret // -1: remove, 0: cancel, 1: change
-        });
-    }
-
-    function onDropDownChange(event) {
-        const { detail } = event;
-		let choice = detail;
-
-        if (Number.isInteger(choice)) {
-            if (Array.isArray(choicesColors) && choice < choicesColors.length) {
-                currentColor = choicesColors[choice];
-            }
-            if (Array.isArray(choices) && choice < choices.length) {
-                currentLabel = choices[choice][0];
-            }
-        } else {
-            currentLabel = choice;
-        }
-    }
-
-    function onColorChange(event) {
-        const { detail } = event;
-		currentColor = detail;
-    }
-
-    function onDropDownEnter(event) {
-        onDropDownChange(event);
-        dispatchChange(1);
-    }
-
-    function onLockClick(event) {
-        labelDetailLock = !labelDetailLock;
-    }
-
-    function handleKeyPress(event: KeyboardEvent) {
-		switch (event.key.toLowerCase()) {
-			case "enter":
-                dispatchChange(1);
-				break;
-            case "escape":
-                dispatchChange(0);
-				break;
-		}
-	}
-
-	onMount(() => {
-		document.addEventListener("keydown", handleKeyPress);
-        currentLabel = label;
-        currentColor = color;
-
-        return () => {
-            document.removeEventListener("keydown", handleKeyPress);
-        };
-	});
-
-</script>
-
-<div class="modal" id="model-box-edit">
-    <div class="modal-container">
-        <span class="model-content">
-            {#if !showRemove}
-            <div style="margin-right: 8px;">
-                <button
-                class="icon"
-                class:selected={labelDetailLock === true}
-                aria-label="Lock label detail"
-                on:click={onLockClick}>
-                {#if labelDetailLock}<Lock/>{:else}<Unlock/>{/if}</button
-                >
-            </div>
-            {/if}
-            <div style="margin-right: 10px;">
-                <BaseDropdown
-                    value={currentLabel}
-                    label="Label"
-                    {choices}
-                    show_label={false}
-                    allow_custom_value={true}
-                    on:change={onDropDownChange}
-                    on:enter={onDropDownEnter}
-                />
-            </div>
-            <div style="margin-right: 40px; margin-bottom: 8px;">
-                <BaseColorPicker
-                    value={currentColor}
-                    label="Color"
-                    show_label={false}
-                    on:change={onColorChange}
-                />
-            </div>
-            <div style="margin-right: 8px;">
-                <BaseButton
-                on:click={() => dispatchChange(0)}
-                >Cancel</BaseButton>
-            </div>
-            {#if showRemove}
-                <div style="margin-right: 8px;">
-                    <BaseButton
-                        variant="stop"
-                        on:click={() => dispatchChange(-1)}
-                    >Remove</BaseButton>
-                </div>
-            {/if}
-            <div>
-                <BaseButton
-                    variant="primary"
-                    on:click={() => dispatchChange(1)}
-                >OK</BaseButton>
-            </div>
-        </span>
-    </div>
-</div>
-
-<style>
-    .modal {
-        position: fixed;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        z-index: var(--layer-top);
-        -webkit-backdrop-filter: blur(4px);
-        backdrop-filter: blur(4px);
-    }
-
-    .modal-container {
-        border-style: solid;
-        border-width: var(--block-border-width);
-        border-color: var(--block-border-color);
-        margin-top: 10%;
-        padding: 20px;
-        box-shadow: var(--block-shadow);
-        border-color: var(--block-border-color);
-        border-radius: var(--block-radius);
-        background: var(--block-background-fill);
-        position: fixed;
-        left: 50%;
-        transform: translateX(-50%);
-        width: fit-content;
-    }
-
-    .model-content {
-        display: flex;
-        align-items: flex-end;
-    }
-
-    .icon {
-		width: 22px;
-		height: 22px;
-		margin: var(--spacing-lg) var(--spacing-xs);
-		padding: var(--spacing-xs);
-		color: var(--neutral-400);
-		border-radius: var(--radius-md);
-	}
-
-    .icon:hover{
-		color: var(--color-accent);
-	}
-
-    .selected {
-		color: var(--color-accent);
-	}
-</style>
+<script lang="ts">
+	import { BaseColorPicker } from "@gradio/colorpicker";
+    import { BaseButton } from "@gradio/button";
+    import { BaseDropdown } from "./patched_dropdown/Index.svelte";
+	import { createEventDispatcher } from "svelte";
+    import { onMount } from "svelte";
+    import { Lock, Unlock } from "./icons/index";
+
+    export let label = "";
+    export let currentLabel = "";
+    export let choices = [];  // [(label, i)]
+    export let choicesColors = [];
+    export let color = "";
+    export let currentColor = "";
+    export let showRemove = true;
+    export let labelDetailLock = false;
+    
+    const dispatch = createEventDispatcher<{
+		change: object;
+	}>();
+
+    function dispatchChange(ret: number) {
+        dispatch("change", {
+            label: currentLabel,
+            color: currentColor,
+            lock: labelDetailLock,
+            ret: ret // -1: remove, 0: cancel, 1: change
+        });
+    }
+
+    function onDropDownChange(event) {
+        const { detail } = event;
+		let choice = detail;
+
+        if (Number.isInteger(choice)) {
+            if (Array.isArray(choicesColors) && choice < choicesColors.length) {
+                currentColor = choicesColors[choice];
+            }
+            if (Array.isArray(choices) && choice < choices.length) {
+                currentLabel = choices[choice][0];
+            }
+        } else {
+            currentLabel = choice;
+        }
+    }
+
+    function onColorChange(event) {
+        const { detail } = event;
+		currentColor = detail;
+    }
+
+    function onDropDownEnter(event) {
+        onDropDownChange(event);
+        dispatchChange(1);
+    }
+
+    function onLockClick(event) {
+        labelDetailLock = !labelDetailLock;
+    }
+
+    function handleKeyPress(event: KeyboardEvent) {
+		switch (event.key.toLowerCase()) {
+			case "enter":
+                dispatchChange(1);
+				break;
+            case "escape":
+                dispatchChange(0);
+				break;
+		}
+	}
+
+	onMount(() => {
+		document.addEventListener("keydown", handleKeyPress);
+        currentLabel = label;
+        currentColor = color;
+
+        return () => {
+            document.removeEventListener("keydown", handleKeyPress);
+        };
+	});
+
+</script>
+
+<div class="modal" id="model-box-edit">
+    <div class="modal-container">
+        <span class="model-content">
+            {#if !showRemove}
+            <div style="margin-right: 8px;">
+                <button
+                class="icon"
+                class:selected={labelDetailLock === true}
+                aria-label="Lock label detail"
+                on:click={onLockClick}>
+                {#if labelDetailLock}<Lock/>{:else}<Unlock/>{/if}</button
+                >
+            </div>
+            {/if}
+            <div style="margin-right: 10px;">
+                <BaseDropdown
+                    value={currentLabel}
+                    label="Label"
+                    {choices}
+                    show_label={false}
+                    allow_custom_value={true}
+                    on:change={onDropDownChange}
+                    on:enter={onDropDownEnter}
+                />
+            </div>
+            <div style="margin-right: 40px; margin-bottom: 8px;">
+                <BaseColorPicker
+                    value={currentColor}
+                    label="Color"
+                    show_label={false}
+                    on:change={onColorChange}
+                />
+            </div>
+            <div style="margin-right: 8px;">
+                <BaseButton
+                on:click={() => dispatchChange(0)}
+                >Cancel</BaseButton>
+            </div>
+            {#if showRemove}
+                <div style="margin-right: 8px;">
+                    <BaseButton
+                        variant="stop"
+                        on:click={() => dispatchChange(-1)}
+                    >Remove</BaseButton>
+                </div>
+            {/if}
+            <div>
+                <BaseButton
+                    variant="primary"
+                    on:click={() => dispatchChange(1)}
+                >OK</BaseButton>
+            </div>
+        </span>
+    </div>
+</div>
+
+<style>
+    .modal {
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: var(--layer-top);
+        -webkit-backdrop-filter: blur(4px);
+        backdrop-filter: blur(4px);
+    }
+
+    .modal-container {
+        border-style: solid;
+        border-width: var(--block-border-width);
+        border-color: var(--block-border-color);
+        margin-top: 10%;
+        padding: 20px;
+        box-shadow: var(--block-shadow);
+        border-color: var(--block-border-color);
+        border-radius: var(--block-radius);
+        background: var(--block-background-fill);
+        position: fixed;
+        left: 50%;
+        transform: translateX(-50%);
+        width: fit-content;
+    }
+
+    .model-content {
+        display: flex;
+        align-items: flex-end;
+    }
+
+    .icon {
+		width: 22px;
+		height: 22px;
+		margin: var(--spacing-lg) var(--spacing-xs);
+		padding: var(--spacing-xs);
+		color: var(--neutral-400);
+		border-radius: var(--radius-md);
+	}
+
+    .icon:hover{
+		color: var(--color-accent);
+	}
+
+    .selected {
+		color: var(--color-accent);
+	}
+</style>

src/frontend/shared/WindowViewer.ts

@@ -1,115 +1,115 @@
-const clamp = (num: number, min: number, max: number) => Math.min(Math.max(num, min), max)
-
-export default class WindowViewer {
-    scale: number;
-    offsetX: number;
-    offsetY: number;
-    canvasWidth: number;
-    canvasHeight: number;
-    imageWidth: number;
-    imageHeight: number;
-    imageRotatedWidth: number;
-    imageRotatedHeight: number;
-    isDragging: boolean;
-    startDragX: number;
-    startDragY: number;
-    orientation: number;
-    renderCallBack: () => void;
-    pointersCache: Map<number, PointerEvent>;
-
-    constructor(
-        renderCallBack: () => void,
-        pointersCache: Map<number, PointerEvent>,
-    ) {
-        this.renderCallBack = renderCallBack;
-        this.pointersCache = pointersCache;
-        this.scale = 1.0;
-        this.offsetX = 0;
-        this.offsetY = 0;
-        this.canvasWidth = 0;
-        this.canvasHeight = 0;
-        this.imageWidth = 0;
-        this.imageHeight = 0;
-        this.imageRotatedWidth = 0;
-        this.imageRotatedHeight = 0;
-        this.isDragging = false;
-        this.startDragX = 0;
-        this.startDragY = 0;
-        this.orientation = 0;
-    }
-    startDrag(event: MouseEvent): void {
-        this.isDragging = true;
-        this.startDragX = event.clientX;
-        this.startDragY = event.clientY;
-
-        document.addEventListener("pointermove", this.handleDrag);
-        document.addEventListener("pointerup", this.stopDrag);
-    }
-
-    stopDrag = (): void => {
-        if (this.pointersCache.size === 0) {
-            this.isDragging = false;
-            document.removeEventListener("pointermove", this.handleDrag);
-            document.removeEventListener("pointerup", this.stopDrag);
-        } else if (this.pointersCache.size === 1) {
-            this.isDragging = true;
-            this.startDragX = this.pointersCache.values().next().value.clientX;
-            this.startDragY = this.pointersCache.values().next().value.clientY;
-        }
-    };
-
-    handleDrag = (event: MouseEvent): void => {
-        if (this.isDragging && this.pointersCache.size === 1) {
-
-            if (this.scale == 1.0){
-                this.offsetX = (this.canvasWidth - this.imageWidth) / 2;
-                this.offsetY = 0;
-                this.renderCallBack();
-                return;
-            }
-
-            let deltaX = event.clientX - this.startDragX;
-            let deltaY = event.clientY - this.startDragY;
-
-            if (this.imageWidth * this.scale > this.canvasWidth){
-                deltaX = clamp(deltaX, this.canvasWidth-this.offsetX-(this.imageWidth*this.scale), -this.offsetX);
-            } else {
-                deltaX = clamp(deltaX, -this.offsetX, this.canvasWidth-this.offsetX-(this.imageWidth*this.scale));
-            }
-
-            if (this.imageHeight * this.scale > this.canvasHeight){
-                deltaY = clamp(deltaY, this.canvasHeight-this.offsetY-(this.imageHeight*this.scale), -this.offsetY);
-            } else {
-                deltaY = clamp(deltaY, -this.offsetY, this.canvasHeight-this.offsetY-(this.imageHeight*this.scale));
-            }
-
-            this.offsetX += deltaX;
-            this.offsetY += deltaY;
-            this.startDragX = event.clientX;
-            this.startDragY = event.clientY;
-            this.renderCallBack();
-        }
-    };
-
-    setRotatedImage(image: HTMLImageElement | null): void {
-        if (image !== null) {
-            if (this.orientation == 0 || this.orientation == 2) {
-                this.imageRotatedWidth = image.width;
-                this.imageRotatedHeight = image.height;
-            } else { // (this.orientation == 1 || this.orientation == 3)
-                this.imageRotatedWidth = image.height;
-                this.imageRotatedHeight = image.width;
-            }
-        }
-    }
-
-    resize(width: number, height: number, offsetX: number=0, offsetY: number=0): void {
-        if (this.canvasWidth == width && this.canvasHeight == height) return;
-        this.canvasWidth = width;
-        this.canvasHeight = height;
-
-        this.scale = 1.0;
-        this.offsetX = offsetX;
-        this.offsetY = offsetY;
-    }
-}
+const clamp = (num: number, min: number, max: number) => Math.min(Math.max(num, min), max)
+
+export default class WindowViewer {
+    scale: number;
+    offsetX: number;
+    offsetY: number;
+    canvasWidth: number;
+    canvasHeight: number;
+    imageWidth: number;
+    imageHeight: number;
+    imageRotatedWidth: number;
+    imageRotatedHeight: number;
+    isDragging: boolean;
+    startDragX: number;
+    startDragY: number;
+    orientation: number;
+    renderCallBack: () => void;
+    pointersCache: Map<number, PointerEvent>;
+
+    constructor(
+        renderCallBack: () => void,
+        pointersCache: Map<number, PointerEvent>,
+    ) {
+        this.renderCallBack = renderCallBack;
+        this.pointersCache = pointersCache;
+        this.scale = 1.0;
+        this.offsetX = 0;
+        this.offsetY = 0;
+        this.canvasWidth = 0;
+        this.canvasHeight = 0;
+        this.imageWidth = 0;
+        this.imageHeight = 0;
+        this.imageRotatedWidth = 0;
+        this.imageRotatedHeight = 0;
+        this.isDragging = false;
+        this.startDragX = 0;
+        this.startDragY = 0;
+        this.orientation = 0;
+    }
+    startDrag(event: MouseEvent): void {
+        this.isDragging = true;
+        this.startDragX = event.clientX;
+        this.startDragY = event.clientY;
+
+        document.addEventListener("pointermove", this.handleDrag);
+        document.addEventListener("pointerup", this.stopDrag);
+    }
+
+    stopDrag = (): void => {
+        if (this.pointersCache.size === 0) {
+            this.isDragging = false;
+            document.removeEventListener("pointermove", this.handleDrag);
+            document.removeEventListener("pointerup", this.stopDrag);
+        } else if (this.pointersCache.size === 1) {
+            this.isDragging = true;
+            this.startDragX = this.pointersCache.values().next().value.clientX;
+            this.startDragY = this.pointersCache.values().next().value.clientY;
+        }
+    };
+
+    handleDrag = (event: MouseEvent): void => {
+        if (this.isDragging && this.pointersCache.size === 1) {
+
+            if (this.scale == 1.0){
+                this.offsetX = (this.canvasWidth - this.imageWidth) / 2;
+                this.offsetY = 0;
+                this.renderCallBack();
+                return;
+            }
+
+            let deltaX = event.clientX - this.startDragX;
+            let deltaY = event.clientY - this.startDragY;
+
+            if (this.imageWidth * this.scale > this.canvasWidth){
+                deltaX = clamp(deltaX, this.canvasWidth-this.offsetX-(this.imageWidth*this.scale), -this.offsetX);
+            } else {
+                deltaX = clamp(deltaX, -this.offsetX, this.canvasWidth-this.offsetX-(this.imageWidth*this.scale));
+            }
+
+            if (this.imageHeight * this.scale > this.canvasHeight){
+                deltaY = clamp(deltaY, this.canvasHeight-this.offsetY-(this.imageHeight*this.scale), -this.offsetY);
+            } else {
+                deltaY = clamp(deltaY, -this.offsetY, this.canvasHeight-this.offsetY-(this.imageHeight*this.scale));
+            }
+
+            this.offsetX += deltaX;
+            this.offsetY += deltaY;
+            this.startDragX = event.clientX;
+            this.startDragY = event.clientY;
+            this.renderCallBack();
+        }
+    };
+
+    setRotatedImage(image: HTMLImageElement | null): void {
+        if (image !== null) {
+            if (this.orientation == 0 || this.orientation == 2) {
+                this.imageRotatedWidth = image.width;
+                this.imageRotatedHeight = image.height;
+            } else { // (this.orientation == 1 || this.orientation == 3)
+                this.imageRotatedWidth = image.height;
+                this.imageRotatedHeight = image.width;
+            }
+        }
+    }
+
+    resize(width: number, height: number, offsetX: number=0, offsetY: number=0): void {
+        if (this.canvasWidth == width && this.canvasHeight == height) return;
+        this.canvasWidth = width;
+        this.canvasHeight = height;
+
+        this.scale = 1.0;
+        this.offsetX = offsetX;
+        this.offsetY = offsetY;
+    }
+}

src/frontend/shared/icons/Label.svelte

@@ -1,15 +1,15 @@
-<svg
-  width="100%"
-  height="100%"
-  viewBox="0 0 24 24"
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;"
->
-  <path
-    d="M12,2.5L2.5,12c-.7.7-.7,1.8,0,2.4l7.1,7.1c.7.7,1.8.7,2.4,0l9.5-9.5c.3-.3.5-.8.5-1.2V3.7c0-1-.8-1.7-1.7-1.7h-7.1c-.5,0-.9.2-1.2.5ZM7.3,14.1l4.7-4.7M9.9,16.7l2.2-2.2"
-  />
-  <path d="M18.5,6.3c0,.5-.4.9-.9.9s-.9-.4-.9-.9.4-.9.9-.9.9.4.9.9Z" />
-</svg>
+<svg
+  width="100%"
+  height="100%"
+  viewBox="0 0 24 24"
+  xmlns="http://www.w3.org/2000/svg"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;"
+>
+  <path
+    d="M12,2.5L2.5,12c-.7.7-.7,1.8,0,2.4l7.1,7.1c.7.7,1.8.7,2.4,0l9.5-9.5c.3-.3.5-.8.5-1.2V3.7c0-1-.8-1.7-1.7-1.7h-7.1c-.5,0-.9.2-1.2.5ZM7.3,14.1l4.7-4.7M9.9,16.7l2.2-2.2"
+  />
+  <path d="M18.5,6.3c0,.5-.4.9-.9.9s-.9-.4-.9-.9.4-.9.9-.9.9.4.9.9Z" />
+</svg>

src/frontend/shared/icons/Lock.svelte

@@ -1,14 +1,14 @@
-<svg
-  width="100%"
-  height="100%"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;"
-  xmlns="http://www.w3.org/2000/svg"
->
-  <path
-    d="M7 10.0288C7.47142 10 8.05259 10 8.8 10H15.2C15.9474 10 16.5286 10 17 10.0288M7 10.0288C6.41168 10.0647 5.99429 10.1455 5.63803 10.327C5.07354 10.6146 4.6146 11.0735 4.32698 11.638C4 12.2798 4 13.1198 4 14.8V16.2C4 17.8802 4 18.7202 4.32698 19.362C4.6146 19.9265 5.07354 20.3854 5.63803 20.673C6.27976 21 7.11984 21 8.8 21H15.2C16.8802 21 17.7202 21 18.362 20.673C18.9265 20.3854 19.3854 19.9265 19.673 19.362C20 18.7202 20 17.8802 20 16.2V14.8C20 13.1198 20 12.2798 19.673 11.638C19.3854 11.0735 18.9265 10.6146 18.362 10.327C18.0057 10.1455 17.5883 10.0647 17 10.0288M7 10.0288V8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8V10.0288"
-  ></path>
-</svg>
+<svg
+  width="100%"
+  height="100%"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M7 10.0288C7.47142 10 8.05259 10 8.8 10H15.2C15.9474 10 16.5286 10 17 10.0288M7 10.0288C6.41168 10.0647 5.99429 10.1455 5.63803 10.327C5.07354 10.6146 4.6146 11.0735 4.32698 11.638C4 12.2798 4 13.1198 4 14.8V16.2C4 17.8802 4 18.7202 4.32698 19.362C4.6146 19.9265 5.07354 20.3854 5.63803 20.673C6.27976 21 7.11984 21 8.8 21H15.2C16.8802 21 17.7202 21 18.362 20.673C18.9265 20.3854 19.3854 19.9265 19.673 19.362C20 18.7202 20 17.8802 20 16.2V14.8C20 13.1198 20 12.2798 19.673 11.638C19.3854 11.0735 18.9265 10.6146 18.362 10.327C18.0057 10.1455 17.5883 10.0647 17 10.0288M7 10.0288V8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8V10.0288"
+  ></path>
+</svg>

src/frontend/shared/icons/Unlock.svelte

@@ -1,14 +1,14 @@
-<svg
-  width="100%"
-  height="100%"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;"
-  xmlns="http://www.w3.org/2000/svg"
->
-  <path
-    d="M16.584 6C15.8124 4.2341 14.0503 3 12 3C9.23858 3 7 5.23858 7 8V10.0288M7 10.0288C7.47142 10 8.05259 10 8.8 10H15.2C16.8802 10 17.7202 10 18.362 10.327C18.9265 10.6146 19.3854 11.0735 19.673 11.638C20 12.2798 20 13.1198 20 14.8V16.2C20 17.8802 20 18.7202 19.673 19.362C19.3854 19.9265 18.9265 20.3854 18.362 20.673C17.7202 21 16.8802 21 15.2 21H8.8C7.11984 21 6.27976 21 5.63803 20.673C5.07354 20.3854 4.6146 19.9265 4.32698 19.362C4 18.7202 4 17.8802 4 16.2V14.8C4 13.1198 4 12.2798 4.32698 11.638C4.6146 11.0735 5.07354 10.6146 5.63803 10.327C5.99429 10.1455 6.41168 10.0647 7 10.0288Z"
-  ></path>
-</svg>
+<svg
+  width="100%"
+  height="100%"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M16.584 6C15.8124 4.2341 14.0503 3 12 3C9.23858 3 7 5.23858 7 8V10.0288M7 10.0288C7.47142 10 8.05259 10 8.8 10H15.2C16.8802 10 17.7202 10 18.362 10.327C18.9265 10.6146 19.3854 11.0735 19.673 11.638C20 12.2798 20 13.1198 20 14.8V16.2C20 17.8802 20 18.7202 19.673 19.362C19.3854 19.9265 18.9265 20.3854 18.362 20.673C17.7202 21 16.8802 21 15.2 21H8.8C7.11984 21 6.27976 21 5.63803 20.673C5.07354 20.3854 4.6146 19.9265 4.32698 19.362C4 18.7202 4 17.8802 4 16.2V14.8C4 13.1198 4 12.2798 4.32698 11.638C4.6146 11.0735 5.07354 10.6146 5.63803 10.327C5.99429 10.1455 6.41168 10.0647 7 10.0288Z"
+  ></path>
+</svg>

src/frontend/shared/icons/index.ts

@@ -1,7 +1,7 @@
-export { default as Add } from "./Add.svelte";
-export { default as BoundingBox } from "./BoundingBox.svelte";
-export { default as Hand } from "./Hand.svelte";
-export { default as Trash } from "./Trash.svelte";
-export { default as Label } from "./Label.svelte";
-export { default as Lock } from "./Lock.svelte";
+export { default as Add } from "./Add.svelte";
+export { default as BoundingBox } from "./BoundingBox.svelte";
+export { default as Hand } from "./Hand.svelte";
+export { default as Trash } from "./Trash.svelte";
+export { default as Label } from "./Label.svelte";
+export { default as Lock } from "./Lock.svelte";
 export { default as Unlock } from "./Unlock.svelte";

src/frontend/shared/index.ts

@@ -1 +1 @@
-export { default as Image } from "./Image.svelte";
+export { default as Image } from "./Image.svelte";

src/frontend/shared/patched_dropdown/CHANGELOG.md

@@ -1,246 +1,246 @@
-# @gradio/dropdown
-
-## 0.6.3
-
-### Fixes
-
-- [#7567](https://github.com/gradio-app/gradio/pull/7567) [`e340894`](https://github.com/gradio-app/gradio/commit/e340894b1cf2f44dd45e597fd8d9e547f408fbb3) - Quick fix: custom dropdown value.  Thanks [@dawoodkhan82](https://github.com/dawoodkhan82)!
-
-## 0.6.2
-
-### Patch Changes
-
-- Updated dependencies [[`98a2719`](https://github.com/gradio-app/gradio/commit/98a2719bfb9c64338caf9009891b6c6b0b33ea89)]:
-  - @gradio/statustracker@0.4.8
-
-## 0.6.1
-
-### Features
-
-- [#7425](https://github.com/gradio-app/gradio/pull/7425) [`3e4e680`](https://github.com/gradio-app/gradio/commit/3e4e680a52ba5a73c108ef1b328dacd7b6e4b566) - Fixes to the `.key_up()` method to make it usable for a dynamic dropdown autocomplete. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-### Fixes
-
-- [#7431](https://github.com/gradio-app/gradio/pull/7431) [`6b8a7e5`](https://github.com/gradio-app/gradio/commit/6b8a7e5d36887cdfcfbfec1536a915128df0d6b2) - Ensure `gr.Dropdown` can have an empty initial value. Thanks [@hannahblair](https://github.com/hannahblair)!
-
-## 0.6.0
-
-### Fixes
-
-- [#7404](https://github.com/gradio-app/gradio/pull/7404) [`065c5b1`](https://github.com/gradio-app/gradio/commit/065c5b163c4badb9d9cbd06d627fb4ba086003e7) - Add `.key_up` event listener to `gr.Dropdown()`. Thanks [@abidlabs](https://github.com/abidlabs)!
-- [#7401](https://github.com/gradio-app/gradio/pull/7401) [`dff4109`](https://github.com/gradio-app/gradio/commit/dff410955e41145848376784c03fe28ba1c4fd85) - Retain dropdown value if choices have been changed. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.5.2
-
-### Fixes
-
-- [#7192](https://github.com/gradio-app/gradio/pull/7192) [`8dd6f4b`](https://github.com/gradio-app/gradio/commit/8dd6f4bc1901792f05cd59e86df7b1dbab692739) - Handle the case where examples is `null` for all components. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.5.1
-
-### Fixes
-
-- [#7081](https://github.com/gradio-app/gradio/pull/7081) [`44c53d9`](https://github.com/gradio-app/gradio/commit/44c53d9bde7cab605b7dbd16331683d13cae029e) - Fix dropdown refocusing due to `<label />` element. Thanks [@hannahblair](https://github.com/hannahblair)!
-
-## 0.5.0
-
-### Fixes
-
-- [#6933](https://github.com/gradio-app/gradio/pull/6933) [`9cefd2e`](https://github.com/gradio-app/gradio/commit/9cefd2e90a1d0cc4d3e4e953fc5b9b1a7afb68dd) - Refactor examples so they accept data in the same format as is returned by function, rename `.as_example()` to `.process_example()`. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.4.3
-
-### Patch Changes
-
-- Updated dependencies [[`828fb9e`](https://github.com/gradio-app/gradio/commit/828fb9e6ce15b6ea08318675a2361117596a1b5d), [`73268ee`](https://github.com/gradio-app/gradio/commit/73268ee2e39f23ebdd1e927cb49b8d79c4b9a144)]:
-  - @gradio/statustracker@0.4.3
-  - @gradio/atoms@0.4.1
-
-## 0.4.2
-
-### Features
-
-- [#6399](https://github.com/gradio-app/gradio/pull/6399) [`053bec9`](https://github.com/gradio-app/gradio/commit/053bec98be1127e083414024e02cf0bebb0b5142) - Improve CSS token documentation in Storybook. Thanks [@hannahblair](https://github.com/hannahblair)!
-
-### Fixes
-
-- [#6694](https://github.com/gradio-app/gradio/pull/6694) [`dfc61ec`](https://github.com/gradio-app/gradio/commit/dfc61ec4d09da72ddd6e7ab726820529621dbd38) - Fix dropdown blur bug when values are provided as tuples. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.4.1
-
-### Patch Changes
-
-- Updated dependencies [[`206af31`](https://github.com/gradio-app/gradio/commit/206af31d7c1a31013364a44e9b40cf8df304ba50)]:
-  - @gradio/icons@0.3.1
-  - @gradio/atoms@0.3.1
-  - @gradio/statustracker@0.4.1
-
-## 0.4.0
-
-### Features
-
-- [#6517](https://github.com/gradio-app/gradio/pull/6517) [`901f3eebd`](https://github.com/gradio-app/gradio/commit/901f3eebda0a67fa8f3050d80f7f7b5800c7f566) - Allow reselecting the original option in `gr.Dropdown` after value has changed programmatically. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.3.3
-
-### Patch Changes
-
-- Updated dependencies [[`9caddc17b`](https://github.com/gradio-app/gradio/commit/9caddc17b1dea8da1af8ba724c6a5eab04ce0ed8)]:
-  - @gradio/atoms@0.3.0
-  - @gradio/icons@0.3.0
-  - @gradio/statustracker@0.4.0
-
-## 0.3.2
-
-### Fixes
-
-- [#6425](https://github.com/gradio-app/gradio/pull/6425) [`b3ba17dd1`](https://github.com/gradio-app/gradio/commit/b3ba17dd1167d254756d93f1fb01e8be071819b6) - Update the selected indices in `Dropdown` when value changes programmatically. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.3.1
-
-### Patch Changes
-
-- Updated dependencies [[`3cdeabc68`](https://github.com/gradio-app/gradio/commit/3cdeabc6843000310e1a9e1d17190ecbf3bbc780), [`fad92c29d`](https://github.com/gradio-app/gradio/commit/fad92c29dc1f5cd84341aae417c495b33e01245f)]:
-  - @gradio/atoms@0.2.1
-  - @gradio/statustracker@0.3.1
-
-## 0.3.0
-
-### Features
-
-- [#5498](https://github.com/gradio-app/gradio/pull/5498) [`287fe6782`](https://github.com/gradio-app/gradio/commit/287fe6782825479513e79a5cf0ba0fbfe51443d7) - Publish all components to npm. Thanks [@pngwn](https://github.com/pngwn)!
-- [#5498](https://github.com/gradio-app/gradio/pull/5498) [`287fe6782`](https://github.com/gradio-app/gradio/commit/287fe6782825479513e79a5cf0ba0fbfe51443d7) - Custom components. Thanks [@pngwn](https://github.com/pngwn)!
-
-## 0.3.0-beta.8
-
-### Features
-
-- [#6136](https://github.com/gradio-app/gradio/pull/6136) [`667802a6c`](https://github.com/gradio-app/gradio/commit/667802a6cdbfb2ce454a3be5a78e0990b194548a) - JS Component Documentation. Thanks [@freddyaboulton](https://github.com/freddyaboulton)!
-- [#6149](https://github.com/gradio-app/gradio/pull/6149) [`90318b1dd`](https://github.com/gradio-app/gradio/commit/90318b1dd118ae08a695a50e7c556226234ab6dc) - swap `mode` on the frontned to `interactive` to match the backend. Thanks [@pngwn](https://github.com/pngwn)!
-
-### Fixes
-
-- [#6148](https://github.com/gradio-app/gradio/pull/6148) [`0000a1916`](https://github.com/gradio-app/gradio/commit/0000a191688c5480c977c80acdd0c9023865d57e) - fix dropdown arrow size. Thanks [@pngwn](https://github.com/pngwn)!
-
-## 0.3.0-beta.7
-
-### Features
-
-- [#6016](https://github.com/gradio-app/gradio/pull/6016) [`83e947676`](https://github.com/gradio-app/gradio/commit/83e947676d327ca2ab6ae2a2d710c78961c771a0) - Format js in v4 branch. Thanks [@freddyaboulton](https://github.com/freddyaboulton)!
-
-### Fixes
-
-- [#6065](https://github.com/gradio-app/gradio/pull/6065) [`7d07001e8`](https://github.com/gradio-app/gradio/commit/7d07001e8e7ca9cbd2251632667b3a043de49f49) - fix storybook. Thanks [@pngwn](https://github.com/pngwn)!
-
-## 0.3.0-beta.6
-
-### Features
-
-- [#5960](https://github.com/gradio-app/gradio/pull/5960) [`319c30f3f`](https://github.com/gradio-app/gradio/commit/319c30f3fccf23bfe1da6c9b132a6a99d59652f7) - rererefactor frontend files. Thanks [@pngwn](https://github.com/pngwn)!
-- [#5938](https://github.com/gradio-app/gradio/pull/5938) [`13ed8a485`](https://github.com/gradio-app/gradio/commit/13ed8a485d5e31d7d75af87fe8654b661edcca93) - V4: Use beta release versions for '@gradio' packages. Thanks [@freddyaboulton](https://github.com/freddyaboulton)!
-
-## 0.3.3
-
-### Fixes
-
-- [#5839](https://github.com/gradio-app/gradio/pull/5839) [`b83064da0`](https://github.com/gradio-app/gradio/commit/b83064da0005ca055fc15ee478cf064bf91702a4) - Fix error when scrolling dropdown with scrollbar. Thanks [@Kit-p](https://github.com/Kit-p)!
-
-## 0.3.2
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @gradio/utils@0.1.2
-  - @gradio/atoms@0.1.4
-  - @gradio/statustracker@0.2.2
-
-## 0.3.1
-
-### Patch Changes
-
-- Updated dependencies [[`8f0fed857`](https://github.com/gradio-app/gradio/commit/8f0fed857d156830626eb48b469d54d211a582d2)]:
-  - @gradio/icons@0.2.0
-  - @gradio/atoms@0.1.3
-  - @gradio/statustracker@0.2.1
-
-## 0.3.0
-
-### Features
-
-- [#5554](https://github.com/gradio-app/gradio/pull/5554) [`75ddeb390`](https://github.com/gradio-app/gradio/commit/75ddeb390d665d4484667390a97442081b49a423) - Accessibility Improvements. Thanks [@hannahblair](https://github.com/hannahblair)!
-
-## 0.2.2
-
-### Fixes
-
-- [#5544](https://github.com/gradio-app/gradio/pull/5544) [`a0cc9ac9`](https://github.com/gradio-app/gradio/commit/a0cc9ac931554e06dcb091158c9b9ac0cc580b6c) - Fixes dropdown breaking if a user types in invalid value and presses enter. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.2.1
-
-### Fixes
-
-- [#5525](https://github.com/gradio-app/gradio/pull/5525) [`21f1db40`](https://github.com/gradio-app/gradio/commit/21f1db40de6d1717eba97a550e11422a457ba7e9) - Ensure input value saves on dropdown blur. Thanks [@hannahblair](https://github.com/hannahblair)!
-
-## 0.2.0
-
-### Features
-
-- [#5384](https://github.com/gradio-app/gradio/pull/5384) [`ddc02268`](https://github.com/gradio-app/gradio/commit/ddc02268f731bd2ed04b7a5854accf3383f9a0da) - Allows the `gr.Dropdown` to have separate names and values, as well as enables `allow_custom_value` for multiselect dropdown. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-### Fixes
-
-- [#5508](https://github.com/gradio-app/gradio/pull/5508) [`05715f55`](https://github.com/gradio-app/gradio/commit/05715f5599ae3e928d3183c7b0a7f5291f843a96) - Adds a `filterable` parameter to `gr.Dropdown` that controls whether user can type to filter choices. Thanks [@abidlabs](https://github.com/abidlabs)!
-
-## 0.1.3
-
-### Patch Changes
-
-- Updated dependencies [[`afac0006`](https://github.com/gradio-app/gradio/commit/afac0006337ce2840cf497cd65691f2f60ee5912)]:
-  - @gradio/statustracker@0.2.0
-  - @gradio/utils@0.1.1
-  - @gradio/atoms@0.1.2
-
-## 0.1.2
-
-### Fixes
-
-- [#5360](https://github.com/gradio-app/gradio/pull/5360) [`64666525`](https://github.com/gradio-app/gradio/commit/6466652583e3c620df995fb865ef3511a34cb676) - Cancel Dropdown Filter. Thanks [@deckar01](https://github.com/deckar01)!
-
-## 0.1.1
-
-### Fixes
-
-- [#5323](https://github.com/gradio-app/gradio/pull/5323) [`e32b0928`](https://github.com/gradio-app/gradio/commit/e32b0928d2d00342ca917ebb10c379ffc2ec200d) - ensure dropdown stays open when identical data is passed in. Thanks [@pngwn](https://github.com/pngwn)!
-
-## 0.1.0
-
-### Highlights
-
-#### Improve startup performance and markdown support ([#5279](https://github.com/gradio-app/gradio/pull/5279) [`fe057300`](https://github.com/gradio-app/gradio/commit/fe057300f0672c62dab9d9b4501054ac5d45a4ec))
-
-##### Improved markdown support
-
-We now have better support for markdown in `gr.Markdown` and `gr.Dataframe`. Including syntax highlighting and Github Flavoured Markdown. We also have more consistent markdown behaviour and styling.
-
-##### Various performance improvements
-
-These improvements will be particularly beneficial to large applications.
-
-- Rather than attaching events manually, they are now delegated, leading to a significant performance improvement and addressing a performance regression introduced in a recent version of Gradio. App startup for large applications is now around twice as fast.
-- Optimised the mounting of individual components, leading to a modest performance improvement during startup (~30%).
-- Corrected an issue that was causing markdown to re-render infinitely.
-- Ensured that the `gr.3DModel` does re-render prematurely.
-
-Thanks [@pngwn](https://github.com/pngwn)!
-
-### Features
-
-- [#5215](https://github.com/gradio-app/gradio/pull/5215) [`fbdad78a`](https://github.com/gradio-app/gradio/commit/fbdad78af4c47454cbb570f88cc14bf4479bbceb) - Lazy load interactive or static variants of a component individually, rather than loading both variants regardless. This change will improve performance for many applications. Thanks [@pngwn](https://github.com/pngwn)!
-- [#5216](https://github.com/gradio-app/gradio/pull/5216) [`4b58ea6d`](https://github.com/gradio-app/gradio/commit/4b58ea6d98e7a43b3f30d8a4cb6f379bc2eca6a8) - Update i18n tokens and locale files. Thanks [@hannahblair](https://github.com/hannahblair)!
-
-## 0.0.2
-
-### Fixes
-
-- [#5062](https://github.com/gradio-app/gradio/pull/5062) [`7d897165`](https://github.com/gradio-app/gradio/commit/7d89716519d0751072792c9bbda668ffeb597296) - `gr.Dropdown` now has correct behavior in static mode as well as when an option is selected. Thanks [@abidlabs](https://github.com/abidlabs)!
+# @gradio/dropdown
+
+## 0.6.3
+
+### Fixes
+
+- [#7567](https://github.com/gradio-app/gradio/pull/7567) [`e340894`](https://github.com/gradio-app/gradio/commit/e340894b1cf2f44dd45e597fd8d9e547f408fbb3) - Quick fix: custom dropdown value.  Thanks [@dawoodkhan82](https://github.com/dawoodkhan82)!
+
+## 0.6.2
+
+### Patch Changes
+
+- Updated dependencies [[`98a2719`](https://github.com/gradio-app/gradio/commit/98a2719bfb9c64338caf9009891b6c6b0b33ea89)]:
+  - @gradio/statustracker@0.4.8
+
+## 0.6.1
+
+### Features
+
+- [#7425](https://github.com/gradio-app/gradio/pull/7425) [`3e4e680`](https://github.com/gradio-app/gradio/commit/3e4e680a52ba5a73c108ef1b328dacd7b6e4b566) - Fixes to the `.key_up()` method to make it usable for a dynamic dropdown autocomplete. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+### Fixes
+
+- [#7431](https://github.com/gradio-app/gradio/pull/7431) [`6b8a7e5`](https://github.com/gradio-app/gradio/commit/6b8a7e5d36887cdfcfbfec1536a915128df0d6b2) - Ensure `gr.Dropdown` can have an empty initial value. Thanks [@hannahblair](https://github.com/hannahblair)!
+
+## 0.6.0
+
+### Fixes
+
+- [#7404](https://github.com/gradio-app/gradio/pull/7404) [`065c5b1`](https://github.com/gradio-app/gradio/commit/065c5b163c4badb9d9cbd06d627fb4ba086003e7) - Add `.key_up` event listener to `gr.Dropdown()`. Thanks [@abidlabs](https://github.com/abidlabs)!
+- [#7401](https://github.com/gradio-app/gradio/pull/7401) [`dff4109`](https://github.com/gradio-app/gradio/commit/dff410955e41145848376784c03fe28ba1c4fd85) - Retain dropdown value if choices have been changed. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.5.2
+
+### Fixes
+
+- [#7192](https://github.com/gradio-app/gradio/pull/7192) [`8dd6f4b`](https://github.com/gradio-app/gradio/commit/8dd6f4bc1901792f05cd59e86df7b1dbab692739) - Handle the case where examples is `null` for all components. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.5.1
+
+### Fixes
+
+- [#7081](https://github.com/gradio-app/gradio/pull/7081) [`44c53d9`](https://github.com/gradio-app/gradio/commit/44c53d9bde7cab605b7dbd16331683d13cae029e) - Fix dropdown refocusing due to `<label />` element. Thanks [@hannahblair](https://github.com/hannahblair)!
+
+## 0.5.0
+
+### Fixes
+
+- [#6933](https://github.com/gradio-app/gradio/pull/6933) [`9cefd2e`](https://github.com/gradio-app/gradio/commit/9cefd2e90a1d0cc4d3e4e953fc5b9b1a7afb68dd) - Refactor examples so they accept data in the same format as is returned by function, rename `.as_example()` to `.process_example()`. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.4.3
+
+### Patch Changes
+
+- Updated dependencies [[`828fb9e`](https://github.com/gradio-app/gradio/commit/828fb9e6ce15b6ea08318675a2361117596a1b5d), [`73268ee`](https://github.com/gradio-app/gradio/commit/73268ee2e39f23ebdd1e927cb49b8d79c4b9a144)]:
+  - @gradio/statustracker@0.4.3
+  - @gradio/atoms@0.4.1
+
+## 0.4.2
+
+### Features
+
+- [#6399](https://github.com/gradio-app/gradio/pull/6399) [`053bec9`](https://github.com/gradio-app/gradio/commit/053bec98be1127e083414024e02cf0bebb0b5142) - Improve CSS token documentation in Storybook. Thanks [@hannahblair](https://github.com/hannahblair)!
+
+### Fixes
+
+- [#6694](https://github.com/gradio-app/gradio/pull/6694) [`dfc61ec`](https://github.com/gradio-app/gradio/commit/dfc61ec4d09da72ddd6e7ab726820529621dbd38) - Fix dropdown blur bug when values are provided as tuples. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.4.1
+
+### Patch Changes
+
+- Updated dependencies [[`206af31`](https://github.com/gradio-app/gradio/commit/206af31d7c1a31013364a44e9b40cf8df304ba50)]:
+  - @gradio/icons@0.3.1
+  - @gradio/atoms@0.3.1
+  - @gradio/statustracker@0.4.1
+
+## 0.4.0
+
+### Features
+
+- [#6517](https://github.com/gradio-app/gradio/pull/6517) [`901f3eebd`](https://github.com/gradio-app/gradio/commit/901f3eebda0a67fa8f3050d80f7f7b5800c7f566) - Allow reselecting the original option in `gr.Dropdown` after value has changed programmatically. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies [[`9caddc17b`](https://github.com/gradio-app/gradio/commit/9caddc17b1dea8da1af8ba724c6a5eab04ce0ed8)]:
+  - @gradio/atoms@0.3.0
+  - @gradio/icons@0.3.0
+  - @gradio/statustracker@0.4.0
+
+## 0.3.2
+
+### Fixes
+
+- [#6425](https://github.com/gradio-app/gradio/pull/6425) [`b3ba17dd1`](https://github.com/gradio-app/gradio/commit/b3ba17dd1167d254756d93f1fb01e8be071819b6) - Update the selected indices in `Dropdown` when value changes programmatically. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`3cdeabc68`](https://github.com/gradio-app/gradio/commit/3cdeabc6843000310e1a9e1d17190ecbf3bbc780), [`fad92c29d`](https://github.com/gradio-app/gradio/commit/fad92c29dc1f5cd84341aae417c495b33e01245f)]:
+  - @gradio/atoms@0.2.1
+  - @gradio/statustracker@0.3.1
+
+## 0.3.0
+
+### Features
+
+- [#5498](https://github.com/gradio-app/gradio/pull/5498) [`287fe6782`](https://github.com/gradio-app/gradio/commit/287fe6782825479513e79a5cf0ba0fbfe51443d7) - Publish all components to npm. Thanks [@pngwn](https://github.com/pngwn)!
+- [#5498](https://github.com/gradio-app/gradio/pull/5498) [`287fe6782`](https://github.com/gradio-app/gradio/commit/287fe6782825479513e79a5cf0ba0fbfe51443d7) - Custom components. Thanks [@pngwn](https://github.com/pngwn)!
+
+## 0.3.0-beta.8
+
+### Features
+
+- [#6136](https://github.com/gradio-app/gradio/pull/6136) [`667802a6c`](https://github.com/gradio-app/gradio/commit/667802a6cdbfb2ce454a3be5a78e0990b194548a) - JS Component Documentation. Thanks [@freddyaboulton](https://github.com/freddyaboulton)!
+- [#6149](https://github.com/gradio-app/gradio/pull/6149) [`90318b1dd`](https://github.com/gradio-app/gradio/commit/90318b1dd118ae08a695a50e7c556226234ab6dc) - swap `mode` on the frontned to `interactive` to match the backend. Thanks [@pngwn](https://github.com/pngwn)!
+
+### Fixes
+
+- [#6148](https://github.com/gradio-app/gradio/pull/6148) [`0000a1916`](https://github.com/gradio-app/gradio/commit/0000a191688c5480c977c80acdd0c9023865d57e) - fix dropdown arrow size. Thanks [@pngwn](https://github.com/pngwn)!
+
+## 0.3.0-beta.7
+
+### Features
+
+- [#6016](https://github.com/gradio-app/gradio/pull/6016) [`83e947676`](https://github.com/gradio-app/gradio/commit/83e947676d327ca2ab6ae2a2d710c78961c771a0) - Format js in v4 branch. Thanks [@freddyaboulton](https://github.com/freddyaboulton)!
+
+### Fixes
+
+- [#6065](https://github.com/gradio-app/gradio/pull/6065) [`7d07001e8`](https://github.com/gradio-app/gradio/commit/7d07001e8e7ca9cbd2251632667b3a043de49f49) - fix storybook. Thanks [@pngwn](https://github.com/pngwn)!
+
+## 0.3.0-beta.6
+
+### Features
+
+- [#5960](https://github.com/gradio-app/gradio/pull/5960) [`319c30f3f`](https://github.com/gradio-app/gradio/commit/319c30f3fccf23bfe1da6c9b132a6a99d59652f7) - rererefactor frontend files. Thanks [@pngwn](https://github.com/pngwn)!
+- [#5938](https://github.com/gradio-app/gradio/pull/5938) [`13ed8a485`](https://github.com/gradio-app/gradio/commit/13ed8a485d5e31d7d75af87fe8654b661edcca93) - V4: Use beta release versions for '@gradio' packages. Thanks [@freddyaboulton](https://github.com/freddyaboulton)!
+
+## 0.3.3
+
+### Fixes
+
+- [#5839](https://github.com/gradio-app/gradio/pull/5839) [`b83064da0`](https://github.com/gradio-app/gradio/commit/b83064da0005ca055fc15ee478cf064bf91702a4) - Fix error when scrolling dropdown with scrollbar. Thanks [@Kit-p](https://github.com/Kit-p)!
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @gradio/utils@0.1.2
+  - @gradio/atoms@0.1.4
+  - @gradio/statustracker@0.2.2
+
+## 0.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`8f0fed857`](https://github.com/gradio-app/gradio/commit/8f0fed857d156830626eb48b469d54d211a582d2)]:
+  - @gradio/icons@0.2.0
+  - @gradio/atoms@0.1.3
+  - @gradio/statustracker@0.2.1
+
+## 0.3.0
+
+### Features
+
+- [#5554](https://github.com/gradio-app/gradio/pull/5554) [`75ddeb390`](https://github.com/gradio-app/gradio/commit/75ddeb390d665d4484667390a97442081b49a423) - Accessibility Improvements. Thanks [@hannahblair](https://github.com/hannahblair)!
+
+## 0.2.2
+
+### Fixes
+
+- [#5544](https://github.com/gradio-app/gradio/pull/5544) [`a0cc9ac9`](https://github.com/gradio-app/gradio/commit/a0cc9ac931554e06dcb091158c9b9ac0cc580b6c) - Fixes dropdown breaking if a user types in invalid value and presses enter. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.2.1
+
+### Fixes
+
+- [#5525](https://github.com/gradio-app/gradio/pull/5525) [`21f1db40`](https://github.com/gradio-app/gradio/commit/21f1db40de6d1717eba97a550e11422a457ba7e9) - Ensure input value saves on dropdown blur. Thanks [@hannahblair](https://github.com/hannahblair)!
+
+## 0.2.0
+
+### Features
+
+- [#5384](https://github.com/gradio-app/gradio/pull/5384) [`ddc02268`](https://github.com/gradio-app/gradio/commit/ddc02268f731bd2ed04b7a5854accf3383f9a0da) - Allows the `gr.Dropdown` to have separate names and values, as well as enables `allow_custom_value` for multiselect dropdown. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+### Fixes
+
+- [#5508](https://github.com/gradio-app/gradio/pull/5508) [`05715f55`](https://github.com/gradio-app/gradio/commit/05715f5599ae3e928d3183c7b0a7f5291f843a96) - Adds a `filterable` parameter to `gr.Dropdown` that controls whether user can type to filter choices. Thanks [@abidlabs](https://github.com/abidlabs)!
+
+## 0.1.3
+
+### Patch Changes
+
+- Updated dependencies [[`afac0006`](https://github.com/gradio-app/gradio/commit/afac0006337ce2840cf497cd65691f2f60ee5912)]:
+  - @gradio/statustracker@0.2.0
+  - @gradio/utils@0.1.1
+  - @gradio/atoms@0.1.2
+
+## 0.1.2
+
+### Fixes
+
+- [#5360](https://github.com/gradio-app/gradio/pull/5360) [`64666525`](https://github.com/gradio-app/gradio/commit/6466652583e3c620df995fb865ef3511a34cb676) - Cancel Dropdown Filter. Thanks [@deckar01](https://github.com/deckar01)!
+
+## 0.1.1
+
+### Fixes
+
+- [#5323](https://github.com/gradio-app/gradio/pull/5323) [`e32b0928`](https://github.com/gradio-app/gradio/commit/e32b0928d2d00342ca917ebb10c379ffc2ec200d) - ensure dropdown stays open when identical data is passed in. Thanks [@pngwn](https://github.com/pngwn)!
+
+## 0.1.0
+
+### Highlights
+
+#### Improve startup performance and markdown support ([#5279](https://github.com/gradio-app/gradio/pull/5279) [`fe057300`](https://github.com/gradio-app/gradio/commit/fe057300f0672c62dab9d9b4501054ac5d45a4ec))
+
+##### Improved markdown support
+
+We now have better support for markdown in `gr.Markdown` and `gr.Dataframe`. Including syntax highlighting and Github Flavoured Markdown. We also have more consistent markdown behaviour and styling.
+
+##### Various performance improvements
+
+These improvements will be particularly beneficial to large applications.
+
+- Rather than attaching events manually, they are now delegated, leading to a significant performance improvement and addressing a performance regression introduced in a recent version of Gradio. App startup for large applications is now around twice as fast.
+- Optimised the mounting of individual components, leading to a modest performance improvement during startup (~30%).
+- Corrected an issue that was causing markdown to re-render infinitely.
+- Ensured that the `gr.3DModel` does re-render prematurely.
+
+Thanks [@pngwn](https://github.com/pngwn)!
+
+### Features
+
+- [#5215](https://github.com/gradio-app/gradio/pull/5215) [`fbdad78a`](https://github.com/gradio-app/gradio/commit/fbdad78af4c47454cbb570f88cc14bf4479bbceb) - Lazy load interactive or static variants of a component individually, rather than loading both variants regardless. This change will improve performance for many applications. Thanks [@pngwn](https://github.com/pngwn)!
+- [#5216](https://github.com/gradio-app/gradio/pull/5216) [`4b58ea6d`](https://github.com/gradio-app/gradio/commit/4b58ea6d98e7a43b3f30d8a4cb6f379bc2eca6a8) - Update i18n tokens and locale files. Thanks [@hannahblair](https://github.com/hannahblair)!
+
+## 0.0.2
+
+### Fixes
+
+- [#5062](https://github.com/gradio-app/gradio/pull/5062) [`7d897165`](https://github.com/gradio-app/gradio/commit/7d89716519d0751072792c9bbda668ffeb597296) - `gr.Dropdown` now has correct behavior in static mode as well as when an option is selected. Thanks [@abidlabs](https://github.com/abidlabs)!
 - [#5039](https://github.com/gradio-app/gradio/pull/5039) [`620e4645`](https://github.com/gradio-app/gradio/commit/620e46452729d6d4877b3fab84a65daf2f2b7bc6) - `gr.Dropdown()` now supports values with arbitrary characters and doesn't clear value when re-focused. Thanks [@abidlabs](https://github.com/abidlabs)!

src/frontend/shared/patched_dropdown/Dropdown.stories.svelte

@@ -1,60 +1,60 @@
-<script lang="ts">
-	import { Meta, Template, Story } from "@storybook/addon-svelte-csf";
-	import Dropdown from "./shared/Dropdown.svelte";
-</script>
-
-<Meta
-	title="Components/Dropdown"
-	component={Dropdown}
-	argTypes={{
-		multiselect: {
-			control: [true, false],
-			description: "Whether to autoplay the video on load",
-			name: "multiselect",
-			value: false
-		}
-	}}
-/>
-
-<Template let:args>
-	<Dropdown {...args} />
-</Template>
-
-<Story
-	name="Single-select"
-	args={{
-		value: "swim",
-		choices: [
-			["run", "run"],
-			["swim", "swim"],
-			["jump", "jump"]
-		],
-		label: "Single-select Dropdown"
-	}}
-/>
-<Story
-	name="Single-select Static"
-	args={{
-		value: "swim",
-		choices: [
-			["run", "run"],
-			["swim", "swim"],
-			["jump", "jump"]
-		],
-		disabled: true,
-		label: "Single-select Dropdown"
-	}}
-/>
-
-<Story
-	name="Empty initial value"
-	args={{
-		interactive: true,
-		choices: [
-			["run", "run"],
-			["swim", "swim"],
-			["jump", "jump"]
-		],
-		label: "Empty Dropdown"
-	}}
-/>
+<script lang="ts">
+	import { Meta, Template, Story } from "@storybook/addon-svelte-csf";
+	import Dropdown from "./shared/Dropdown.svelte";
+</script>
+
+<Meta
+	title="Components/Dropdown"
+	component={Dropdown}
+	argTypes={{
+		multiselect: {
+			control: [true, false],
+			description: "Whether to autoplay the video on load",
+			name: "multiselect",
+			value: false
+		}
+	}}
+/>
+
+<Template let:args>
+	<Dropdown {...args} />
+</Template>
+
+<Story
+	name="Single-select"
+	args={{
+		value: "swim",
+		choices: [
+			["run", "run"],
+			["swim", "swim"],
+			["jump", "jump"]
+		],
+		label: "Single-select Dropdown"
+	}}
+/>
+<Story
+	name="Single-select Static"
+	args={{
+		value: "swim",
+		choices: [
+			["run", "run"],
+			["swim", "swim"],
+			["jump", "jump"]
+		],
+		disabled: true,
+		label: "Single-select Dropdown"
+	}}
+/>
+
+<Story
+	name="Empty initial value"
+	args={{
+		interactive: true,
+		choices: [
+			["run", "run"],
+			["swim", "swim"],
+			["jump", "jump"]
+		],
+		label: "Empty Dropdown"
+	}}
+/>

src/frontend/shared/patched_dropdown/Example.svelte

@@ -1,33 +1,33 @@
-<script lang="ts">
-	export let value: string | string[] | null;
-	export let type: "gallery" | "table";
-	export let selected = false;
-	export let choices: [string, string | number][];
-
-	let value_array = value ? (Array.isArray(value) ? value : [value]) : [];
-	let names = value_array
-		.map(
-			(val) =>
-				(
-					choices.find((pair) => pair[1] === val) as
-						| [string, string | number]
-						| undefined
-				)?.[0]
-		)
-		.filter((name) => name !== undefined);
-	let names_string = names.join(", ");
-</script>
-
-<div
-	class:table={type === "table"}
-	class:gallery={type === "gallery"}
-	class:selected
->
-	{names_string}
-</div>
-
-<style>
-	.gallery {
-		padding: var(--size-1) var(--size-2);
-	}
-</style>
+<script lang="ts">
+	export let value: string | string[] | null;
+	export let type: "gallery" | "table";
+	export let selected = false;
+	export let choices: [string, string | number][];
+
+	let value_array = value ? (Array.isArray(value) ? value : [value]) : [];
+	let names = value_array
+		.map(
+			(val) =>
+				(
+					choices.find((pair) => pair[1] === val) as
+						| [string, string | number]
+						| undefined
+				)?.[0]
+		)
+		.filter((name) => name !== undefined);
+	let names_string = names.join(", ");
+</script>
+
+<div
+	class:table={type === "table"}
+	class:gallery={type === "gallery"}
+	class:selected
+>
+	{names_string}
+</div>
+
+<style>
+	.gallery {
+		padding: var(--size-1) var(--size-2);
+	}
+</style>

src/frontend/shared/patched_dropdown/Index.svelte

@@ -1,99 +1,99 @@
-<script context="module" lang="ts">
-	export { default as BaseDropdown } from "./shared/Dropdown.svelte";
-	export { default as BaseMultiselect } from "./shared/Multiselect.svelte";
-	export { default as BaseExample } from "./Example.svelte";
-</script>
-
-<script lang="ts">
-	import type { Gradio, KeyUpData, SelectData } from "@gradio/utils";
-	import Multiselect from "./shared/Multiselect.svelte";
-	import Dropdown from "./shared/Dropdown.svelte";
-	import { Block } from "@gradio/atoms";
-	import { StatusTracker } from "@gradio/statustracker";
-	import type { LoadingStatus } from "@gradio/statustracker";
-
-	export let label = "Dropdown";
-	export let info: string | undefined = undefined;
-	export let elem_id = "";
-	export let elem_classes: string[] = [];
-	export let visible = true;
-	export let value: string | string[] | undefined = undefined;
-	export let value_is_output = false;
-	export let multiselect = false;
-	export let max_choices: number | null = null;
-	export let choices: [string, string | number][];
-	export let show_label: boolean;
-	export let filterable: boolean;
-	export let container = true;
-	export let scale: number | null = null;
-	export let min_width: number | undefined = undefined;
-	export let loading_status: LoadingStatus;
-	export let allow_custom_value = false;
-	export let gradio: Gradio<{
-		change: never;
-		input: never;
-		select: SelectData;
-		blur: never;
-		focus: never;
-		key_up: KeyUpData;
-	}>;
-	export let interactive: boolean;
-</script>
-
-<Block
-	{visible}
-	{elem_id}
-	{elem_classes}
-	padding={container}
-	allow_overflow={false}
-	{scale}
-	{min_width}
->
-	<StatusTracker
-		autoscroll={gradio.autoscroll}
-		i18n={gradio.i18n}
-		{...loading_status}
-	/>
-
-	{#if multiselect}
-		<Multiselect
-			bind:value
-			bind:value_is_output
-			{choices}
-			{max_choices}
-			{label}
-			{info}
-			{show_label}
-			{allow_custom_value}
-			{filterable}
-			{container}
-			i18n={gradio.i18n}
-			on:change={() => gradio.dispatch("change")}
-			on:input={() => gradio.dispatch("input")}
-			on:select={(e) => gradio.dispatch("select", e.detail)}
-			on:blur={() => gradio.dispatch("blur")}
-			on:focus={() => gradio.dispatch("focus")}
-			on:key_up={() => gradio.dispatch("key_up")}
-			disabled={!interactive}
-		/>
-	{:else}
-		<Dropdown
-			bind:value
-			bind:value_is_output
-			{choices}
-			{label}
-			{info}
-			{show_label}
-			{filterable}
-			{allow_custom_value}
-			{container}
-			on:change={() => gradio.dispatch("change")}
-			on:input={() => gradio.dispatch("input")}
-			on:select={(e) => gradio.dispatch("select", e.detail)}
-			on:blur={() => gradio.dispatch("blur")}
-			on:focus={() => gradio.dispatch("focus")}
-			on:key_up={(e) => gradio.dispatch("key_up", e.detail)}
-			disabled={!interactive}
-		/>
-	{/if}
-</Block>
+<script context="module" lang="ts">
+	export { default as BaseDropdown } from "./shared/Dropdown.svelte";
+	export { default as BaseMultiselect } from "./shared/Multiselect.svelte";
+	export { default as BaseExample } from "./Example.svelte";
+</script>
+
+<script lang="ts">
+	import type { Gradio, KeyUpData, SelectData } from "@gradio/utils";
+	import Multiselect from "./shared/Multiselect.svelte";
+	import Dropdown from "./shared/Dropdown.svelte";
+	import { Block } from "@gradio/atoms";
+	import { StatusTracker } from "@gradio/statustracker";
+	import type { LoadingStatus } from "@gradio/statustracker";
+
+	export let label = "Dropdown";
+	export let info: string | undefined = undefined;
+	export let elem_id = "";
+	export let elem_classes: string[] = [];
+	export let visible = true;
+	export let value: string | string[] | undefined = undefined;
+	export let value_is_output = false;
+	export let multiselect = false;
+	export let max_choices: number | null = null;
+	export let choices: [string, string | number][];
+	export let show_label: boolean;
+	export let filterable: boolean;
+	export let container = true;
+	export let scale: number | null = null;
+	export let min_width: number | undefined = undefined;
+	export let loading_status: LoadingStatus;
+	export let allow_custom_value = false;
+	export let gradio: Gradio<{
+		change: never;
+		input: never;
+		select: SelectData;
+		blur: never;
+		focus: never;
+		key_up: KeyUpData;
+	}>;
+	export let interactive: boolean;
+</script>
+
+<Block
+	{visible}
+	{elem_id}
+	{elem_classes}
+	padding={container}
+	allow_overflow={false}
+	{scale}
+	{min_width}
+>
+	<StatusTracker
+		autoscroll={gradio.autoscroll}
+		i18n={gradio.i18n}
+		{...loading_status}
+	/>
+
+	{#if multiselect}
+		<Multiselect
+			bind:value
+			bind:value_is_output
+			{choices}
+			{max_choices}
+			{label}
+			{info}
+			{show_label}
+			{allow_custom_value}
+			{filterable}
+			{container}
+			i18n={gradio.i18n}
+			on:change={() => gradio.dispatch("change")}
+			on:input={() => gradio.dispatch("input")}
+			on:select={(e) => gradio.dispatch("select", e.detail)}
+			on:blur={() => gradio.dispatch("blur")}
+			on:focus={() => gradio.dispatch("focus")}
+			on:key_up={() => gradio.dispatch("key_up")}
+			disabled={!interactive}
+		/>
+	{:else}
+		<Dropdown
+			bind:value
+			bind:value_is_output
+			{choices}
+			{label}
+			{info}
+			{show_label}
+			{filterable}
+			{allow_custom_value}
+			{container}
+			on:change={() => gradio.dispatch("change")}
+			on:input={() => gradio.dispatch("input")}
+			on:select={(e) => gradio.dispatch("select", e.detail)}
+			on:blur={() => gradio.dispatch("blur")}
+			on:focus={() => gradio.dispatch("focus")}
+			on:key_up={(e) => gradio.dispatch("key_up", e.detail)}
+			disabled={!interactive}
+		/>
+	{/if}
+</Block>

src/frontend/shared/patched_dropdown/LICENSE

@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

src/frontend/shared/patched_dropdown/Multiselect.stories.svelte

@@ -1,48 +1,48 @@
-<script>
-	import { Meta, Template, Story } from "@storybook/addon-svelte-csf";
-	import Multiselect from "./shared/Multiselect.svelte";
-	import { format } from "svelte-i18n";
-	import { get } from "svelte/store";
-</script>
-
-<Meta
-	title="Components/Multiselect"
-	component={Multiselect}
-	argTypes={{
-		multiselect: {
-			control: [true, false],
-			name: "multiselect",
-			value: false
-		}
-	}}
-/>
-
-<Template let:args>
-	<Multiselect {...args} i18n={get(format)} />
-</Template>
-
-<Story
-	name="Multiselect Interactive"
-	args={{
-		value: ["swim", "run"],
-		choices: [
-			["run", "run"],
-			["swim", "swim"],
-			["jump", "jump"]
-		],
-		label: "Multiselect Dropdown"
-	}}
-/>
-<Story
-	name="Multiselect Static"
-	args={{
-		value: ["swim", "run"],
-		choices: [
-			["run", "run"],
-			["swim", "swim"],
-			["jump", "jump"]
-		],
-		label: "Multiselect Dropdown",
-		disabled: true
-	}}
-/>
+<script>
+	import { Meta, Template, Story } from "@storybook/addon-svelte-csf";
+	import Multiselect from "./shared/Multiselect.svelte";
+	import { format } from "svelte-i18n";
+	import { get } from "svelte/store";
+</script>
+
+<Meta
+	title="Components/Multiselect"
+	component={Multiselect}
+	argTypes={{
+		multiselect: {
+			control: [true, false],
+			name: "multiselect",
+			value: false
+		}
+	}}
+/>
+
+<Template let:args>
+	<Multiselect {...args} i18n={get(format)} />
+</Template>
+
+<Story
+	name="Multiselect Interactive"
+	args={{
+		value: ["swim", "run"],
+		choices: [
+			["run", "run"],
+			["swim", "swim"],
+			["jump", "jump"]
+		],
+		label: "Multiselect Dropdown"
+	}}
+/>
+<Story
+	name="Multiselect Static"
+	args={{
+		value: ["swim", "run"],
+		choices: [
+			["run", "run"],
+			["swim", "swim"],
+			["jump", "jump"]
+		],
+		label: "Multiselect Dropdown",
+		disabled: true
+	}}
+/>

src/frontend/shared/patched_dropdown/README.md

@@ -1,44 +1,44 @@
-# `@gradio/dropdown`
-
-```html
-<script>
-    import {BaseDropdown, BaseMultiselect, BaseExample } from "@gradio/dropdown";
-</script>
-```
-
-BaseDropdown
-```javascript
-	export let label: string;
-	export let info: string | undefined = undefined;
-	export let value: string | number | (string | number)[] | undefined = [];
-	export let value_is_output = false;
-	export let choices: [string, string | number][];
-	export let disabled = false;
-	export let show_label: boolean;
-	export let container = true;
-	export let allow_custom_value = false;
-	export let filterable = true;
-```
-
-BaseMultiselect
-```javascript
-	export let label: string;
-	export let info: string | undefined = undefined;
-	export let value: string | number | (string | number)[] | undefined = [];
-	export let value_is_output = false;
-	export let max_choices: number | null = null;
-	export let choices: [string, string | number][];
-	export let disabled = false;
-	export let show_label: boolean;
-	export let container = true;
-	export let allow_custom_value = false;
-	export let filterable = true;
-	export let i18n: I18nFormatter;
-```
-
-BaseExample
-```javascript
-	export let value: string;
-	export let type: "gallery" | "table";
-	export let selected = false;    
+# `@gradio/dropdown`
+
+```html
+<script>
+    import {BaseDropdown, BaseMultiselect, BaseExample } from "@gradio/dropdown";
+</script>
+```
+
+BaseDropdown
+```javascript
+	export let label: string;
+	export let info: string | undefined = undefined;
+	export let value: string | number | (string | number)[] | undefined = [];
+	export let value_is_output = false;
+	export let choices: [string, string | number][];
+	export let disabled = false;
+	export let show_label: boolean;
+	export let container = true;
+	export let allow_custom_value = false;
+	export let filterable = true;
+```
+
+BaseMultiselect
+```javascript
+	export let label: string;
+	export let info: string | undefined = undefined;
+	export let value: string | number | (string | number)[] | undefined = [];
+	export let value_is_output = false;
+	export let max_choices: number | null = null;
+	export let choices: [string, string | number][];
+	export let disabled = false;
+	export let show_label: boolean;
+	export let container = true;
+	export let allow_custom_value = false;
+	export let filterable = true;
+	export let i18n: I18nFormatter;
+```
+
+BaseExample
+```javascript
+	export let value: string;
+	export let type: "gallery" | "table";
+	export let selected = false;    
 ```

src/frontend/shared/patched_dropdown/dropdown.test.ts

@@ -1,515 +1,515 @@
-import { test, describe, assert, afterEach, vi } from "vitest";
-import { cleanup, render } from "@gradio/tootils";
-import event from "@testing-library/user-event";
-import { setupi18n } from "../app/src/i18n";
-
-import Dropdown from "./Index.svelte";
-import type { LoadingStatus } from "@gradio/statustracker";
-
-const loading_status: LoadingStatus = {
-	eta: 0,
-	queue_position: 1,
-	queue_size: 1,
-	status: "complete" as LoadingStatus["status"],
-	scroll_to_output: false,
-	visible: true,
-	fn_index: 0,
-	show_progress: "full"
-};
-
-describe("Dropdown", () => {
-	afterEach(() => {
-		cleanup();
-		vi.useRealTimers();
-	});
-	beforeEach(() => {
-		setupi18n();
-	});
-	test("renders provided value", async () => {
-		const { getByLabelText } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			max_choices: null,
-			value: "choice",
-			label: "Dropdown",
-			choices: [
-				["choice", "choice"],
-				["choice2", "choice2"]
-			],
-			filterable: false,
-			interactive: false
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-		assert.equal(item.value, "choice");
-	});
-
-	test("selecting the textbox should show the options", async () => {
-		const { getByLabelText, getAllByTestId } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			max_choices: 10,
-			value: "choice",
-			label: "Dropdown",
-			choices: [
-				["choice", "choice"],
-				["name2", "choice2"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await item.focus();
-
-		const options = getAllByTestId("dropdown-option");
-
-		expect(options).toHaveLength(2);
-		expect(options[0]).toContainHTML("choice");
-		expect(options[1]).toContainHTML("name2");
-	});
-
-	test("editing the textbox value should trigger the type event and filter the options", async () => {
-		const { getByLabelText, listen, getAllByTestId } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			max_choices: 10,
-			value: "",
-			label: "Dropdown",
-			choices: [
-				["apple", "apple"],
-				["zebra", "zebra"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const key_up_event = listen("key_up");
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await item.focus();
-		const options = getAllByTestId("dropdown-option");
-
-		expect(options).toHaveLength(2);
-
-		item.value = "";
-		await event.keyboard("z");
-
-		const options_new = getAllByTestId("dropdown-option");
-
-		await expect(options_new).toHaveLength(1);
-		await expect(options[0]).toContainHTML("zebra");
-		await assert.equal(key_up_event.callCount, 1);
-	});
-
-	test("blurring the textbox should cancel the filter", async () => {
-		const { getByLabelText, listen } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			value: "default",
-			label: "Dropdown",
-			max_choices: undefined,
-			choices: [
-				["default", "default"],
-				["other", "other"]
-			],
-			filterable: false,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		item.focus();
-		await event.keyboard("other");
-	});
-
-	test("blurring the textbox should save the input value", async () => {
-		const { getByLabelText, listen } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			value: "new ",
-			label: "Dropdown",
-			max_choices: undefined,
-			allow_custom_value: true,
-			choices: [
-				["dwight", "dwight"],
-				["michael", "michael"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-		const change_event = listen("change");
-
-		item.focus();
-		await event.keyboard("kevin");
-		await item.blur();
-
-		assert.equal(item.value, "new kevin");
-		assert.equal(change_event.callCount, 1);
-	});
-
-	test("focusing the label should toggle the options", async () => {
-		const { getByLabelText, listen } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			value: "default",
-			label: "Dropdown",
-			choices: [
-				["default", "default"],
-				["other", "other"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-		const blur_event = listen("blur");
-		const focus_event = listen("focus");
-
-		item.focus();
-		item.blur();
-
-		assert.equal(blur_event.callCount, 1);
-		assert.equal(focus_event.callCount, 1);
-	});
-
-	test("deselecting and reselcting a filtered dropdown should show all options again", async () => {
-		vi.useFakeTimers();
-		const { getByLabelText, getAllByTestId } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			max_choices: 10,
-			value: "",
-			label: "Dropdown",
-			choices: [
-				["apple", "apple"],
-				["zebra", "zebra"],
-				["pony", "pony"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		item.focus();
-		item.value = "";
-		await event.keyboard("z");
-		const options = getAllByTestId("dropdown-option");
-
-		expect(options).toHaveLength(1);
-
-		await item.blur();
-		// Mock 100ms delay between interactions.
-		vi.runAllTimers();
-		await item.focus();
-		const options_new = getAllByTestId("dropdown-option");
-
-		expect(options_new).toHaveLength(3);
-	});
-
-	test("passing in a new set of identical choices when the dropdown is open should not filter the dropdown", async () => {
-		const { getByLabelText, getAllByTestId, component } = await render(
-			Dropdown,
-			{
-				show_label: true,
-				loading_status,
-				value: "",
-				label: "Dropdown",
-				choices: [
-					["apple", "apple"],
-					["zebra", "zebra"],
-					["pony", "pony"]
-				],
-				filterable: true,
-				interactive: true
-			}
-		);
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await item.focus();
-
-		const options = getAllByTestId("dropdown-option");
-
-		expect(options).toHaveLength(3);
-
-		component.$set({
-			value: "",
-			choices: [
-				["apple", "apple"],
-				["zebra", "zebra"],
-				["pony", "pony"]
-			]
-		});
-
-		item.focus();
-
-		const options_new = getAllByTestId("dropdown-option");
-		expect(options_new).toHaveLength(3);
-	});
-
-	test("setting a custom value when allow_custom_choice is false should revert to the first valid choice", async () => {
-		const { getByLabelText, getAllByTestId, component } = await render(
-			Dropdown,
-			{
-				show_label: true,
-				loading_status,
-				value: "",
-				allow_custom_value: false,
-				label: "Dropdown",
-				choices: [
-					["apple", "apple"],
-					["zebra", "zebra"],
-					["pony", "pony"]
-				],
-				filterable: true,
-				interactive: true
-			}
-		);
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await item.focus();
-		await event.keyboard("pie");
-		expect(item.value).toBe("applepie");
-		await item.blur();
-		expect(item.value).toBe("apple");
-	});
-
-	test("setting a custom value when allow_custom_choice is true should keep the value", async () => {
-		const { getByLabelText, getAllByTestId, component } = await render(
-			Dropdown,
-			{
-				show_label: true,
-				loading_status,
-				value: "",
-				allow_custom_value: true,
-				label: "Dropdown",
-				choices: [
-					["apple", "apple"],
-					["zebra", "zebra"],
-					["pony", "pony"]
-				],
-				filterable: true,
-				interactive: true
-			}
-		);
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await item.focus();
-		await event.keyboard("pie");
-		expect(item.value).toBe("applepie");
-		await item.blur();
-		expect(item.value).toBe("applepie");
-	});
-
-	test("setting a value should update the displayed value and selected indices", async () => {
-		const { getByLabelText, getAllByTestId, component } = await render(
-			Dropdown,
-			{
-				show_label: true,
-				loading_status,
-				value: "",
-				allow_custom_value: false,
-				label: "Dropdown",
-				choices: [
-					["apple", "apple"],
-					["zebra", "zebra"],
-					["pony", "pony"]
-				],
-				filterable: true,
-				interactive: true
-			}
-		);
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		expect(item.value).toBe("apple");
-		await item.focus();
-		let options = getAllByTestId("dropdown-option");
-		expect(options[0]).toHaveClass("selected");
-
-		await component.$set({ value: "zebra" });
-		expect(item.value).toBe("zebra");
-		options = getAllByTestId("dropdown-option");
-		expect(options[0]).toHaveClass("selected");
-
-		await component.$set({ value: undefined });
-		expect(item.value).toBe("");
-		options = getAllByTestId("dropdown-option");
-		expect(options[0]).not.toHaveClass("selected");
-
-		await component.$set({ value: "zebra" });
-		expect(item.value).toBe("zebra");
-		options = getAllByTestId("dropdown-option");
-		expect(options[0]).toHaveClass("selected");
-	});
-
-	test("blurring a dropdown should set the input text to the previously selected value", async () => {
-		const { getByLabelText, getAllByTestId, component } = await render(
-			Dropdown,
-			{
-				show_label: true,
-				loading_status,
-				value: "",
-				allow_custom_value: false,
-				label: "Dropdown",
-				choices: [
-					["apple", "apple_internal_value"],
-					["zebra", "zebra_internal_value"],
-					["pony", "pony_internal_value"]
-				],
-				filterable: true,
-				interactive: true
-			}
-		);
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		expect(item.value).toBe("apple");
-		await item.focus();
-		let options = getAllByTestId("dropdown-option");
-		expect(options[0]).toHaveClass("selected");
-		await item.blur();
-		expect(item.value).toBe("apple");
-
-		await item.focus();
-		await event.keyboard("z");
-		expect(item.value).toBe("applez");
-		await item.blur();
-		expect(item.value).toBe("apple");
-	});
-
-	test("updating choices should keep the dropdown focus-able and change the value appropriately if custom values are not allowed", async () => {
-		const { getByLabelText, component } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			value: "apple_internal_value",
-			allow_custom_value: false,
-			label: "Dropdown",
-			choices: [
-				["apple_choice", "apple_internal_value"],
-				["zebra_choice", "zebra_internal_value"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await expect(item.value).toBe("apple_choice");
-
-		component.$set({
-			choices: [
-				["apple_new_choice", "apple_internal_value"],
-				["zebra_new_choice", "zebra_internal_value"]
-			]
-		});
-
-		await item.focus();
-		await item.blur();
-		await expect(item.value).toBe("apple_new_choice");
-	});
-
-	test("updating choices should not reset the value if custom values are allowed", async () => {
-		const { getByLabelText, component } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			value: "apple_internal_value",
-			allow_custom_value: true,
-			label: "Dropdown",
-			choices: [
-				["apple_choice", "apple_internal_value"],
-				["zebra_choice", "zebra_internal_value"]
-			],
-			filterable: true,
-			interactive: true
-		});
-
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-
-		await expect(item.value).toBe("apple_choice");
-
-		component.$set({
-			choices: [
-				["apple_new_choice", "apple_internal_value"],
-				["zebra_new_choice", "zebra_internal_value"]
-			]
-		});
-
-		await expect(item.value).toBe("apple_choice");
-	});
-
-	test("ensure dropdown can have an empty value", async () => {
-		const { getByLabelText } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			allow_custom_value: false,
-			label: "Dropdown",
-			choices: [
-				["apple_choice", "apple_internal_value"],
-				["zebra_choice", "zebra_internal_value"]
-			],
-			filterable: true,
-			interactive: true
-		});
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-		await expect(item.value).toBe("");
-	});
-
-	test("ensure dropdown works when initial value is undefined and allow custom value is set", async () => {
-		const { getByLabelText } = await render(Dropdown, {
-			show_label: true,
-			loading_status,
-			value: undefined,
-			allow_custom_value: true,
-			label: "Dropdown",
-			choices: [
-				["apple_choice", "apple_internal_value"],
-				["zebra_choice", "zebra_internal_value"]
-			],
-			filterable: true,
-			interactive: true
-		});
-		const item: HTMLInputElement = getByLabelText(
-			"Dropdown"
-		) as HTMLInputElement;
-		await expect(item.value).toBe("");
-	});
-});
+import { test, describe, assert, afterEach, vi } from "vitest";
+import { cleanup, render } from "@gradio/tootils";
+import event from "@testing-library/user-event";
+import { setupi18n } from "../app/src/i18n";
+
+import Dropdown from "./Index.svelte";
+import type { LoadingStatus } from "@gradio/statustracker";
+
+const loading_status: LoadingStatus = {
+	eta: 0,
+	queue_position: 1,
+	queue_size: 1,
+	status: "complete" as LoadingStatus["status"],
+	scroll_to_output: false,
+	visible: true,
+	fn_index: 0,
+	show_progress: "full"
+};
+
+describe("Dropdown", () => {
+	afterEach(() => {
+		cleanup();
+		vi.useRealTimers();
+	});
+	beforeEach(() => {
+		setupi18n();
+	});
+	test("renders provided value", async () => {
+		const { getByLabelText } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			max_choices: null,
+			value: "choice",
+			label: "Dropdown",
+			choices: [
+				["choice", "choice"],
+				["choice2", "choice2"]
+			],
+			filterable: false,
+			interactive: false
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+		assert.equal(item.value, "choice");
+	});
+
+	test("selecting the textbox should show the options", async () => {
+		const { getByLabelText, getAllByTestId } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			max_choices: 10,
+			value: "choice",
+			label: "Dropdown",
+			choices: [
+				["choice", "choice"],
+				["name2", "choice2"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await item.focus();
+
+		const options = getAllByTestId("dropdown-option");
+
+		expect(options).toHaveLength(2);
+		expect(options[0]).toContainHTML("choice");
+		expect(options[1]).toContainHTML("name2");
+	});
+
+	test("editing the textbox value should trigger the type event and filter the options", async () => {
+		const { getByLabelText, listen, getAllByTestId } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			max_choices: 10,
+			value: "",
+			label: "Dropdown",
+			choices: [
+				["apple", "apple"],
+				["zebra", "zebra"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const key_up_event = listen("key_up");
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await item.focus();
+		const options = getAllByTestId("dropdown-option");
+
+		expect(options).toHaveLength(2);
+
+		item.value = "";
+		await event.keyboard("z");
+
+		const options_new = getAllByTestId("dropdown-option");
+
+		await expect(options_new).toHaveLength(1);
+		await expect(options[0]).toContainHTML("zebra");
+		await assert.equal(key_up_event.callCount, 1);
+	});
+
+	test("blurring the textbox should cancel the filter", async () => {
+		const { getByLabelText, listen } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			value: "default",
+			label: "Dropdown",
+			max_choices: undefined,
+			choices: [
+				["default", "default"],
+				["other", "other"]
+			],
+			filterable: false,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		item.focus();
+		await event.keyboard("other");
+	});
+
+	test("blurring the textbox should save the input value", async () => {
+		const { getByLabelText, listen } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			value: "new ",
+			label: "Dropdown",
+			max_choices: undefined,
+			allow_custom_value: true,
+			choices: [
+				["dwight", "dwight"],
+				["michael", "michael"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+		const change_event = listen("change");
+
+		item.focus();
+		await event.keyboard("kevin");
+		await item.blur();
+
+		assert.equal(item.value, "new kevin");
+		assert.equal(change_event.callCount, 1);
+	});
+
+	test("focusing the label should toggle the options", async () => {
+		const { getByLabelText, listen } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			value: "default",
+			label: "Dropdown",
+			choices: [
+				["default", "default"],
+				["other", "other"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+		const blur_event = listen("blur");
+		const focus_event = listen("focus");
+
+		item.focus();
+		item.blur();
+
+		assert.equal(blur_event.callCount, 1);
+		assert.equal(focus_event.callCount, 1);
+	});
+
+	test("deselecting and reselcting a filtered dropdown should show all options again", async () => {
+		vi.useFakeTimers();
+		const { getByLabelText, getAllByTestId } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			max_choices: 10,
+			value: "",
+			label: "Dropdown",
+			choices: [
+				["apple", "apple"],
+				["zebra", "zebra"],
+				["pony", "pony"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		item.focus();
+		item.value = "";
+		await event.keyboard("z");
+		const options = getAllByTestId("dropdown-option");
+
+		expect(options).toHaveLength(1);
+
+		await item.blur();
+		// Mock 100ms delay between interactions.
+		vi.runAllTimers();
+		await item.focus();
+		const options_new = getAllByTestId("dropdown-option");
+
+		expect(options_new).toHaveLength(3);
+	});
+
+	test("passing in a new set of identical choices when the dropdown is open should not filter the dropdown", async () => {
+		const { getByLabelText, getAllByTestId, component } = await render(
+			Dropdown,
+			{
+				show_label: true,
+				loading_status,
+				value: "",
+				label: "Dropdown",
+				choices: [
+					["apple", "apple"],
+					["zebra", "zebra"],
+					["pony", "pony"]
+				],
+				filterable: true,
+				interactive: true
+			}
+		);
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await item.focus();
+
+		const options = getAllByTestId("dropdown-option");
+
+		expect(options).toHaveLength(3);
+
+		component.$set({
+			value: "",
+			choices: [
+				["apple", "apple"],
+				["zebra", "zebra"],
+				["pony", "pony"]
+			]
+		});
+
+		item.focus();
+
+		const options_new = getAllByTestId("dropdown-option");
+		expect(options_new).toHaveLength(3);
+	});
+
+	test("setting a custom value when allow_custom_choice is false should revert to the first valid choice", async () => {
+		const { getByLabelText, getAllByTestId, component } = await render(
+			Dropdown,
+			{
+				show_label: true,
+				loading_status,
+				value: "",
+				allow_custom_value: false,
+				label: "Dropdown",
+				choices: [
+					["apple", "apple"],
+					["zebra", "zebra"],
+					["pony", "pony"]
+				],
+				filterable: true,
+				interactive: true
+			}
+		);
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await item.focus();
+		await event.keyboard("pie");
+		expect(item.value).toBe("applepie");
+		await item.blur();
+		expect(item.value).toBe("apple");
+	});
+
+	test("setting a custom value when allow_custom_choice is true should keep the value", async () => {
+		const { getByLabelText, getAllByTestId, component } = await render(
+			Dropdown,
+			{
+				show_label: true,
+				loading_status,
+				value: "",
+				allow_custom_value: true,
+				label: "Dropdown",
+				choices: [
+					["apple", "apple"],
+					["zebra", "zebra"],
+					["pony", "pony"]
+				],
+				filterable: true,
+				interactive: true
+			}
+		);
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await item.focus();
+		await event.keyboard("pie");
+		expect(item.value).toBe("applepie");
+		await item.blur();
+		expect(item.value).toBe("applepie");
+	});
+
+	test("setting a value should update the displayed value and selected indices", async () => {
+		const { getByLabelText, getAllByTestId, component } = await render(
+			Dropdown,
+			{
+				show_label: true,
+				loading_status,
+				value: "",
+				allow_custom_value: false,
+				label: "Dropdown",
+				choices: [
+					["apple", "apple"],
+					["zebra", "zebra"],
+					["pony", "pony"]
+				],
+				filterable: true,
+				interactive: true
+			}
+		);
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		expect(item.value).toBe("apple");
+		await item.focus();
+		let options = getAllByTestId("dropdown-option");
+		expect(options[0]).toHaveClass("selected");
+
+		await component.$set({ value: "zebra" });
+		expect(item.value).toBe("zebra");
+		options = getAllByTestId("dropdown-option");
+		expect(options[0]).toHaveClass("selected");
+
+		await component.$set({ value: undefined });
+		expect(item.value).toBe("");
+		options = getAllByTestId("dropdown-option");
+		expect(options[0]).not.toHaveClass("selected");
+
+		await component.$set({ value: "zebra" });
+		expect(item.value).toBe("zebra");
+		options = getAllByTestId("dropdown-option");
+		expect(options[0]).toHaveClass("selected");
+	});
+
+	test("blurring a dropdown should set the input text to the previously selected value", async () => {
+		const { getByLabelText, getAllByTestId, component } = await render(
+			Dropdown,
+			{
+				show_label: true,
+				loading_status,
+				value: "",
+				allow_custom_value: false,
+				label: "Dropdown",
+				choices: [
+					["apple", "apple_internal_value"],
+					["zebra", "zebra_internal_value"],
+					["pony", "pony_internal_value"]
+				],
+				filterable: true,
+				interactive: true
+			}
+		);
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		expect(item.value).toBe("apple");
+		await item.focus();
+		let options = getAllByTestId("dropdown-option");
+		expect(options[0]).toHaveClass("selected");
+		await item.blur();
+		expect(item.value).toBe("apple");
+
+		await item.focus();
+		await event.keyboard("z");
+		expect(item.value).toBe("applez");
+		await item.blur();
+		expect(item.value).toBe("apple");
+	});
+
+	test("updating choices should keep the dropdown focus-able and change the value appropriately if custom values are not allowed", async () => {
+		const { getByLabelText, component } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			value: "apple_internal_value",
+			allow_custom_value: false,
+			label: "Dropdown",
+			choices: [
+				["apple_choice", "apple_internal_value"],
+				["zebra_choice", "zebra_internal_value"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await expect(item.value).toBe("apple_choice");
+
+		component.$set({
+			choices: [
+				["apple_new_choice", "apple_internal_value"],
+				["zebra_new_choice", "zebra_internal_value"]
+			]
+		});
+
+		await item.focus();
+		await item.blur();
+		await expect(item.value).toBe("apple_new_choice");
+	});
+
+	test("updating choices should not reset the value if custom values are allowed", async () => {
+		const { getByLabelText, component } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			value: "apple_internal_value",
+			allow_custom_value: true,
+			label: "Dropdown",
+			choices: [
+				["apple_choice", "apple_internal_value"],
+				["zebra_choice", "zebra_internal_value"]
+			],
+			filterable: true,
+			interactive: true
+		});
+
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+
+		await expect(item.value).toBe("apple_choice");
+
+		component.$set({
+			choices: [
+				["apple_new_choice", "apple_internal_value"],
+				["zebra_new_choice", "zebra_internal_value"]
+			]
+		});
+
+		await expect(item.value).toBe("apple_choice");
+	});
+
+	test("ensure dropdown can have an empty value", async () => {
+		const { getByLabelText } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			allow_custom_value: false,
+			label: "Dropdown",
+			choices: [
+				["apple_choice", "apple_internal_value"],
+				["zebra_choice", "zebra_internal_value"]
+			],
+			filterable: true,
+			interactive: true
+		});
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+		await expect(item.value).toBe("");
+	});
+
+	test("ensure dropdown works when initial value is undefined and allow custom value is set", async () => {
+		const { getByLabelText } = await render(Dropdown, {
+			show_label: true,
+			loading_status,
+			value: undefined,
+			allow_custom_value: true,
+			label: "Dropdown",
+			choices: [
+				["apple_choice", "apple_internal_value"],
+				["zebra_choice", "zebra_internal_value"]
+			],
+			filterable: true,
+			interactive: true
+		});
+		const item: HTMLInputElement = getByLabelText(
+			"Dropdown"
+		) as HTMLInputElement;
+		await expect(item.value).toBe("");
+	});
+});

src/frontend/shared/patched_dropdown/package.json

@@ -1,21 +1,21 @@
-{
-  "name": "@gradio/dropdown",
-  "version": "0.6.3",
-  "description": "Gradio UI packages",
-  "type": "module",
-  "author": "",
-  "license": "ISC",
-  "private": false,
-  "main_changeset": true,
-  "exports": {
-    ".": "./Index.svelte",
-    "./example": "./Example.svelte",
-    "./package.json": "./package.json"
-  },
-  "dependencies": {
-    "@gradio/atoms": "^0.5.3",
-    "@gradio/icons": "^0.3.3",
-    "@gradio/statustracker": "^0.4.8",
-    "@gradio/utils": "^0.3.0"
-  }
+{
+  "name": "@gradio/dropdown",
+  "version": "0.6.3",
+  "description": "Gradio UI packages",
+  "type": "module",
+  "author": "",
+  "license": "ISC",
+  "private": false,
+  "main_changeset": true,
+  "exports": {
+    ".": "./Index.svelte",
+    "./example": "./Example.svelte",
+    "./package.json": "./package.json"
+  },
+  "dependencies": {
+    "@gradio/atoms": "^0.5.3",
+    "@gradio/icons": "^0.3.3",
+    "@gradio/statustracker": "^0.4.8",
+    "@gradio/utils": "^0.3.0"
+  }
 }

src/frontend/shared/patched_dropdown/shared/Dropdown.svelte

@@ -1,326 +1,326 @@
-<script lang="ts">
-    import { onMount } from "svelte";
-	import DropdownOptions from "./DropdownOptions.svelte";
-	import { createEventDispatcher, afterUpdate } from "svelte";
-	import { BlockTitle } from "@gradio/atoms";
-	import { DropdownArrow } from "@gradio/icons";
-	import type { SelectData, KeyUpData } from "@gradio/utils";
-	import { handle_filter, handle_change, handle_shared_keys } from "./utils";
-
-	export let label: string;
-	export let info: string | undefined = undefined;
-	export let value: string | number | (string | number)[] | undefined = [];
-	let old_value: string | number | (string | number)[] | undefined = [];
-	export let value_is_output = false;
-	export let choices: [string, string | number][];
-	let old_choices: [string, string | number][];
-	export let disabled = false;
-	export let show_label: boolean;
-	export let container = true;
-	export let allow_custom_value = false;
-	export let filterable = true;
-
-	let filter_input: HTMLElement;
-
-	let show_options = false;
-	let choices_names: string[];
-	let choices_values: (string | number)[];
-	let input_text = "";
-	let old_input_text = "";
-	let initialized = false;
-
-	// All of these are indices with respect to the choices array
-	let filtered_indices: number[] = [];
-	let active_index: number | null = null;
-	// selected_index is null if allow_custom_value is true and the input_text is not in choices_names
-	let selected_index: number | null = null;
-	let old_selected_index: number | null;
-
-	const dispatch = createEventDispatcher<{
-		change: string | undefined;
-		input: undefined;
-		select: SelectData;
-		blur: undefined;
-		focus: undefined;
-		key_up: KeyUpData;
-		enter: any;
-	}>();
-
-	// Setting the initial value of the dropdown
-	if (value) {
-		old_selected_index = choices.map((c) => c[1]).indexOf(value as string);
-		selected_index = old_selected_index;
-		if (selected_index === -1) {
-			old_value = value;
-			selected_index = null;
-		} else {
-			[input_text, old_value] = choices[selected_index];
-			old_input_text = input_text;
-		}
-		set_input_text();
-	} else if (choices.length > 0) {
-		old_selected_index = 0;
-		selected_index = 0;
-		[input_text, value] = choices[selected_index];
-		old_value = value;
-		old_input_text = input_text;
-	}
-
-	$: {
-		if (
-			selected_index !== old_selected_index &&
-			selected_index !== null &&
-			initialized
-		) {
-			[input_text, value] = choices[selected_index];
-			old_selected_index = selected_index;
-			dispatch("select", {
-				index: selected_index,
-				value: choices_values[selected_index],
-				selected: true
-			});
-		}
-	}
-
-	$: {
-		if (value != old_value) {
-			set_input_text();
-			handle_change(dispatch, value, value_is_output);
-			old_value = value;
-		}
-	}
-
-	function set_choice_names_values(): void {
-		choices_names = choices.map((c) => c[0]);
-		choices_values = choices.map((c) => c[1]);
-	}
-
-	$: choices, set_choice_names_values();
-
-	$: {
-		if (choices !== old_choices) {
-			if (!allow_custom_value) {
-				set_input_text();
-			}
-			old_choices = choices;
-			filtered_indices = handle_filter(choices, input_text);
-			if (!allow_custom_value && filtered_indices.length > 0) {
-				active_index = filtered_indices[0];
-			}
-			if (filter_input == document.activeElement) {
-				show_options = true;
-			}
-		}
-	}
-
-	$: {
-		if (input_text !== old_input_text) {
-			filtered_indices = handle_filter(choices, input_text);
-			old_input_text = input_text;
-			if (!allow_custom_value && filtered_indices.length > 0) {
-				active_index = filtered_indices[0];
-			}
-		}
-	}
-
-	function set_input_text(): void {
-		set_choice_names_values();
-		if (value === undefined || (Array.isArray(value) && value.length === 0)) {
-			input_text = "";
-			selected_index = null;
-		} else if (choices_values.includes(value as string)) {
-			input_text = choices_names[choices_values.indexOf(value as string)];
-			selected_index = choices_values.indexOf(value as string);
-		} else if (allow_custom_value) {
-			input_text = value as string;
-			selected_index = null;
-		} else {
-			input_text = "";
-			selected_index = null;
-		}
-		old_selected_index = selected_index;
-	}
-
-	function handle_option_selected(e: any): void {
-		selected_index = parseInt(e.detail.target.dataset.index);
-		if (isNaN(selected_index)) {
-			// This is the case when the user clicks on the scrollbar
-			selected_index = null;
-			return;
-		}
-		show_options = false;
-		active_index = null;
-		filter_input.blur();
-	}
-
-	function handle_focus(e: FocusEvent): void {
-		filtered_indices = choices.map((_, i) => i);
-		show_options = true;
-		dispatch("focus");
-	}
-
-	function handle_blur(): void {
-		if (!allow_custom_value) {
-			input_text = choices_names[choices_values.indexOf(value as string)];
-		} else {
-			value = input_text;
-		}
-		show_options = false;
-		active_index = null;
-		dispatch("blur");
-	}
-
-	function handle_key_down(e: KeyboardEvent): void {
-		[show_options, active_index] = handle_shared_keys(
-			e,
-			active_index,
-			filtered_indices
-		);
-		if (e.key === "Enter") {
-			if (active_index !== null) {
-				selected_index = active_index;
-				show_options = false;
-				filter_input.blur();
-				active_index = null;
-			} else if (choices_names.includes(input_text)) {
-				selected_index = choices_names.indexOf(input_text);
-				show_options = false;
-				active_index = null;
-				filter_input.blur();
-			} else if (allow_custom_value) {
-				value = input_text;
-				selected_index = null;
-				show_options = false;
-				active_index = null;
-				filter_input.blur();
-			}
-			dispatch("enter", value);
-		}
-	}
-
-	afterUpdate(() => {
-		value_is_output = false;
-		initialized = true;
-	});
-
-	onMount(() => {
-    	filter_input.focus();
-  	});
-</script>
-
-<div class:container>
-	<BlockTitle {show_label} {info}>{label}</BlockTitle>
-
-	<div class="wrap">
-		<div class="wrap-inner" class:show_options>
-			<div class="secondary-wrap">
-				<input
-					role="listbox"
-					aria-controls="dropdown-options"
-					aria-expanded={show_options}
-					aria-label={label}
-					class="border-none"
-					class:subdued={!choices_names.includes(input_text) &&
-						!allow_custom_value}
-					{disabled}
-					autocomplete="off"
-					bind:value={input_text}
-					bind:this={filter_input}
-					on:keydown={handle_key_down}
-					on:keyup={(e) =>
-						dispatch("key_up", {
-							key: e.key,
-							input_value: input_text
-						})}
-					on:blur={handle_blur}
-					on:focus={handle_focus}
-					readonly={!filterable}
-				/>
-				{#if !disabled}
-					<div class="icon-wrap">
-						<DropdownArrow />
-					</div>
-				{/if}
-			</div>
-		</div>
-		<DropdownOptions
-			{show_options}
-			{choices}
-			{filtered_indices}
-			{disabled}
-			selected_indices={selected_index === null ? [] : [selected_index]}
-			{active_index}
-			on:change={handle_option_selected}
-		/>
-	</div>
-</div>
-
-<style>
-	.icon-wrap {
-		color: var(--body-text-color);
-		margin-right: var(--size-2);
-		width: var(--size-5);
-	}
-	.container {
-		height: 100%;
-	}
-	.container .wrap {
-		box-shadow: var(--input-shadow);
-		border: var(--input-border-width) solid var(--border-color-primary);
-	}
-
-	.wrap {
-		position: relative;
-		border-radius: var(--input-radius);
-		background: var(--input-background-fill);
-	}
-
-	.wrap:focus-within {
-		box-shadow: var(--input-shadow-focus);
-		border-color: var(--input-border-color-focus);
-	}
-
-	.wrap-inner {
-		display: flex;
-		position: relative;
-		flex-wrap: wrap;
-		align-items: center;
-		gap: var(--checkbox-label-gap);
-		padding: var(--checkbox-label-padding);
-		height: 100%;
-	}
-	.secondary-wrap {
-		display: flex;
-		flex: 1 1 0%;
-		align-items: center;
-		border: none;
-		min-width: min-content;
-		height: 100%;
-	}
-
-	input {
-		margin: var(--spacing-sm);
-		outline: none;
-		border: none;
-		background: inherit;
-		width: var(--size-full);
-		color: var(--body-text-color);
-		font-size: var(--input-text-size);
-		height: 100%;
-	}
-
-	input:disabled {
-		-webkit-text-fill-color: var(--body-text-color);
-		-webkit-opacity: 1;
-		opacity: 1;
-		cursor: not-allowed;
-	}
-
-	.subdued {
-		color: var(--body-text-color-subdued);
-	}
-
-	input[readonly] {
-		cursor: pointer;
-	}
-</style>
+<script lang="ts">
+    import { onMount } from "svelte";
+	import DropdownOptions from "./DropdownOptions.svelte";
+	import { createEventDispatcher, afterUpdate } from "svelte";
+	import { BlockTitle } from "@gradio/atoms";
+	import { DropdownArrow } from "@gradio/icons";
+	import type { SelectData, KeyUpData } from "@gradio/utils";
+	import { handle_filter, handle_change, handle_shared_keys } from "./utils";
+
+	export let label: string;
+	export let info: string | undefined = undefined;
+	export let value: string | number | (string | number)[] | undefined = [];
+	let old_value: string | number | (string | number)[] | undefined = [];
+	export let value_is_output = false;
+	export let choices: [string, string | number][];
+	let old_choices: [string, string | number][];
+	export let disabled = false;
+	export let show_label: boolean;
+	export let container = true;
+	export let allow_custom_value = false;
+	export let filterable = true;
+
+	let filter_input: HTMLElement;
+
+	let show_options = false;
+	let choices_names: string[];
+	let choices_values: (string | number)[];
+	let input_text = "";
+	let old_input_text = "";
+	let initialized = false;
+
+	// All of these are indices with respect to the choices array
+	let filtered_indices: number[] = [];
+	let active_index: number | null = null;
+	// selected_index is null if allow_custom_value is true and the input_text is not in choices_names
+	let selected_index: number | null = null;
+	let old_selected_index: number | null;
+
+	const dispatch = createEventDispatcher<{
+		change: string | undefined;
+		input: undefined;
+		select: SelectData;
+		blur: undefined;
+		focus: undefined;
+		key_up: KeyUpData;
+		enter: any;
+	}>();
+
+	// Setting the initial value of the dropdown
+	if (value) {
+		old_selected_index = choices.map((c) => c[1]).indexOf(value as string);
+		selected_index = old_selected_index;
+		if (selected_index === -1) {
+			old_value = value;
+			selected_index = null;
+		} else {
+			[input_text, old_value] = choices[selected_index];
+			old_input_text = input_text;
+		}
+		set_input_text();
+	} else if (choices.length > 0) {
+		old_selected_index = 0;
+		selected_index = 0;
+		[input_text, value] = choices[selected_index];
+		old_value = value;
+		old_input_text = input_text;
+	}
+
+	$: {
+		if (
+			selected_index !== old_selected_index &&
+			selected_index !== null &&
+			initialized
+		) {
+			[input_text, value] = choices[selected_index];
+			old_selected_index = selected_index;
+			dispatch("select", {
+				index: selected_index,
+				value: choices_values[selected_index],
+				selected: true
+			});
+		}
+	}
+
+	$: {
+		if (value != old_value) {
+			set_input_text();
+			handle_change(dispatch, value, value_is_output);
+			old_value = value;
+		}
+	}
+
+	function set_choice_names_values(): void {
+		choices_names = choices.map((c) => c[0]);
+		choices_values = choices.map((c) => c[1]);
+	}
+
+	$: choices, set_choice_names_values();
+
+	$: {
+		if (choices !== old_choices) {
+			if (!allow_custom_value) {
+				set_input_text();
+			}
+			old_choices = choices;
+			filtered_indices = handle_filter(choices, input_text);
+			if (!allow_custom_value && filtered_indices.length > 0) {
+				active_index = filtered_indices[0];
+			}
+			if (filter_input == document.activeElement) {
+				show_options = true;
+			}
+		}
+	}
+
+	$: {
+		if (input_text !== old_input_text) {
+			filtered_indices = handle_filter(choices, input_text);
+			old_input_text = input_text;
+			if (!allow_custom_value && filtered_indices.length > 0) {
+				active_index = filtered_indices[0];
+			}
+		}
+	}
+
+	function set_input_text(): void {
+		set_choice_names_values();
+		if (value === undefined || (Array.isArray(value) && value.length === 0)) {
+			input_text = "";
+			selected_index = null;
+		} else if (choices_values.includes(value as string)) {
+			input_text = choices_names[choices_values.indexOf(value as string)];
+			selected_index = choices_values.indexOf(value as string);
+		} else if (allow_custom_value) {
+			input_text = value as string;
+			selected_index = null;
+		} else {
+			input_text = "";
+			selected_index = null;
+		}
+		old_selected_index = selected_index;
+	}
+
+	function handle_option_selected(e: any): void {
+		selected_index = parseInt(e.detail.target.dataset.index);
+		if (isNaN(selected_index)) {
+			// This is the case when the user clicks on the scrollbar
+			selected_index = null;
+			return;
+		}
+		show_options = false;
+		active_index = null;
+		filter_input.blur();
+	}
+
+	function handle_focus(e: FocusEvent): void {
+		filtered_indices = choices.map((_, i) => i);
+		show_options = true;
+		dispatch("focus");
+	}
+
+	function handle_blur(): void {
+		if (!allow_custom_value) {
+			input_text = choices_names[choices_values.indexOf(value as string)];
+		} else {
+			value = input_text;
+		}
+		show_options = false;
+		active_index = null;
+		dispatch("blur");
+	}
+
+	function handle_key_down(e: KeyboardEvent): void {
+		[show_options, active_index] = handle_shared_keys(
+			e,
+			active_index,
+			filtered_indices
+		);
+		if (e.key === "Enter") {
+			if (active_index !== null) {
+				selected_index = active_index;
+				show_options = false;
+				filter_input.blur();
+				active_index = null;
+			} else if (choices_names.includes(input_text)) {
+				selected_index = choices_names.indexOf(input_text);
+				show_options = false;
+				active_index = null;
+				filter_input.blur();
+			} else if (allow_custom_value) {
+				value = input_text;
+				selected_index = null;
+				show_options = false;
+				active_index = null;
+				filter_input.blur();
+			}
+			dispatch("enter", value);
+		}
+	}
+
+	afterUpdate(() => {
+		value_is_output = false;
+		initialized = true;
+	});
+
+	onMount(() => {
+    	filter_input.focus();
+  	});
+</script>
+
+<div class:container>
+	<BlockTitle {show_label} {info}>{label}</BlockTitle>
+
+	<div class="wrap">
+		<div class="wrap-inner" class:show_options>
+			<div class="secondary-wrap">
+				<input
+					role="listbox"
+					aria-controls="dropdown-options"
+					aria-expanded={show_options}
+					aria-label={label}
+					class="border-none"
+					class:subdued={!choices_names.includes(input_text) &&
+						!allow_custom_value}
+					{disabled}
+					autocomplete="off"
+					bind:value={input_text}
+					bind:this={filter_input}
+					on:keydown={handle_key_down}
+					on:keyup={(e) =>
+						dispatch("key_up", {
+							key: e.key,
+							input_value: input_text
+						})}
+					on:blur={handle_blur}
+					on:focus={handle_focus}
+					readonly={!filterable}
+				/>
+				{#if !disabled}
+					<div class="icon-wrap">
+						<DropdownArrow />
+					</div>
+				{/if}
+			</div>
+		</div>
+		<DropdownOptions
+			{show_options}
+			{choices}
+			{filtered_indices}
+			{disabled}
+			selected_indices={selected_index === null ? [] : [selected_index]}
+			{active_index}
+			on:change={handle_option_selected}
+		/>
+	</div>
+</div>
+
+<style>
+	.icon-wrap {
+		color: var(--body-text-color);
+		margin-right: var(--size-2);
+		width: var(--size-5);
+	}
+	.container {
+		height: 100%;
+	}
+	.container .wrap {
+		box-shadow: var(--input-shadow);
+		border: var(--input-border-width) solid var(--border-color-primary);
+	}
+
+	.wrap {
+		position: relative;
+		border-radius: var(--input-radius);
+		background: var(--input-background-fill);
+	}
+
+	.wrap:focus-within {
+		box-shadow: var(--input-shadow-focus);
+		border-color: var(--input-border-color-focus);
+	}
+
+	.wrap-inner {
+		display: flex;
+		position: relative;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: var(--checkbox-label-gap);
+		padding: var(--checkbox-label-padding);
+		height: 100%;
+	}
+	.secondary-wrap {
+		display: flex;
+		flex: 1 1 0%;
+		align-items: center;
+		border: none;
+		min-width: min-content;
+		height: 100%;
+	}
+
+	input {
+		margin: var(--spacing-sm);
+		outline: none;
+		border: none;
+		background: inherit;
+		width: var(--size-full);
+		color: var(--body-text-color);
+		font-size: var(--input-text-size);
+		height: 100%;
+	}
+
+	input:disabled {
+		-webkit-text-fill-color: var(--body-text-color);
+		-webkit-opacity: 1;
+		opacity: 1;
+		cursor: not-allowed;
+	}
+
+	.subdued {
+		color: var(--body-text-color-subdued);
+	}
+
+	input[readonly] {
+		cursor: pointer;
+	}
+</style>

src/frontend/shared/patched_dropdown/shared/DropdownOptions.svelte

@@ -1,144 +1,144 @@
-<script lang="ts">
-	import { fly } from "svelte/transition";
-	import { createEventDispatcher } from "svelte";
-	export let choices: [string, string | number][];
-	export let filtered_indices: number[];
-	export let show_options = false;
-	export let disabled = false;
-	export let selected_indices: (string | number)[] = [];
-	export let active_index: number | null = null;
-
-	let distance_from_top: number;
-	let distance_from_bottom: number;
-	let input_height: number;
-	let input_width: number;
-	let refElement: HTMLDivElement;
-	let listElement: HTMLUListElement;
-	let top: string | null, bottom: string | null, max_height: number;
-	let innerHeight: number;
-
-	function calculate_window_distance(): void {
-		const { top: ref_top, bottom: ref_bottom } =
-			refElement.getBoundingClientRect();
-		distance_from_top = ref_top;
-		distance_from_bottom = innerHeight - ref_bottom;
-	}
-
-	let scroll_timeout: NodeJS.Timeout | null = null;
-	function scroll_listener(): void {
-		if (!show_options) return;
-		if (scroll_timeout !== null) {
-			clearTimeout(scroll_timeout);
-		}
-
-		scroll_timeout = setTimeout(() => {
-			calculate_window_distance();
-			scroll_timeout = null;
-		}, 10);
-	}
-
-	$: {
-		if (show_options && refElement) {
-			if (listElement && selected_indices.length > 0) {
-				let elements = listElement.querySelectorAll("li");
-				for (const element of Array.from(elements)) {
-					if (
-						element.getAttribute("data-index") ===
-						selected_indices[0].toString()
-					) {
-						listElement?.scrollTo?.(0, (element as HTMLLIElement).offsetTop);
-						break;
-					}
-				}
-			}
-			calculate_window_distance();
-			const rect = refElement.parentElement?.getBoundingClientRect();
-			input_height = rect?.height || 0;
-			input_width = rect?.width || 0;
-		}
-		if (distance_from_bottom > distance_from_top) {
-			top = `${distance_from_top}px`;
-			max_height = distance_from_bottom;
-			bottom = null;
-		} else {
-			bottom = `${distance_from_bottom + input_height}px`;
-			max_height = distance_from_top - input_height;
-			top = null;
-		}
-	}
-
-	const dispatch = createEventDispatcher();
-</script>
-
-<svelte:window on:scroll={scroll_listener} bind:innerHeight />
-
-<div class="reference" bind:this={refElement} />
-{#if show_options && !disabled}
-	<ul
-		class="options"
-		transition:fly={{ duration: 200, y: 5 }}
-		on:mousedown|preventDefault={(e) => dispatch("change", e)}
-		
-		style:bottom
-		style:max-height={`calc(${max_height}px - var(--window-padding))`}
-		style:width={input_width + "px"}
-		bind:this={listElement}
-		role="listbox"
-	>
-		{#each filtered_indices as index}
-			<li
-				class="item"
-				class:selected={selected_indices.includes(index)}
-				class:active={index === active_index}
-				class:bg-gray-100={index === active_index}
-				class:dark:bg-gray-600={index === active_index}
-				data-index={index}
-				aria-label={choices[index][0]}
-				data-testid="dropdown-option"
-				role="option"
-				aria-selected={selected_indices.includes(index)}
-			>
-				<span class:hide={!selected_indices.includes(index)} class="inner-item">
-					✓
-				</span>
-				{choices[index][0]}
-			</li>
-		{/each}
-	</ul>
-{/if}
-
-<style>
-	.options {
-		--window-padding: var(--size-8);
-		position: fixed;
-		z-index: var(--layer-top);
-		margin-left: 0;
-		box-shadow: var(--shadow-drop-lg);
-		border-radius: var(--container-radius);
-		background: var(--background-fill-primary);
-		min-width: fit-content;
-		max-width: inherit;
-		overflow: auto;
-		color: var(--body-text-color);
-		list-style: none;
-	}
-
-	.item {
-		display: flex;
-		cursor: pointer;
-		padding: var(--size-2);
-	}
-
-	.item:hover,
-	.active {
-		background: var(--background-fill-secondary);
-	}
-
-	.inner-item {
-		padding-right: var(--size-1);
-	}
-
-	.hide {
-		visibility: hidden;
-	}
-</style>
+<script lang="ts">
+	import { fly } from "svelte/transition";
+	import { createEventDispatcher } from "svelte";
+	export let choices: [string, string | number][];
+	export let filtered_indices: number[];
+	export let show_options = false;
+	export let disabled = false;
+	export let selected_indices: (string | number)[] = [];
+	export let active_index: number | null = null;
+
+	let distance_from_top: number;
+	let distance_from_bottom: number;
+	let input_height: number;
+	let input_width: number;
+	let refElement: HTMLDivElement;
+	let listElement: HTMLUListElement;
+	let top: string | null, bottom: string | null, max_height: number;
+	let innerHeight: number;
+
+	function calculate_window_distance(): void {
+		const { top: ref_top, bottom: ref_bottom } =
+			refElement.getBoundingClientRect();
+		distance_from_top = ref_top;
+		distance_from_bottom = innerHeight - ref_bottom;
+	}
+
+	let scroll_timeout: NodeJS.Timeout | null = null;
+	function scroll_listener(): void {
+		if (!show_options) return;
+		if (scroll_timeout !== null) {
+			clearTimeout(scroll_timeout);
+		}
+
+		scroll_timeout = setTimeout(() => {
+			calculate_window_distance();
+			scroll_timeout = null;
+		}, 10);
+	}
+
+	$: {
+		if (show_options && refElement) {
+			if (listElement && selected_indices.length > 0) {
+				let elements = listElement.querySelectorAll("li");
+				for (const element of Array.from(elements)) {
+					if (
+						element.getAttribute("data-index") ===
+						selected_indices[0].toString()
+					) {
+						listElement?.scrollTo?.(0, (element as HTMLLIElement).offsetTop);
+						break;
+					}
+				}
+			}
+			calculate_window_distance();
+			const rect = refElement.parentElement?.getBoundingClientRect();
+			input_height = rect?.height || 0;
+			input_width = rect?.width || 0;
+		}
+		if (distance_from_bottom > distance_from_top) {
+			top = `${distance_from_top}px`;
+			max_height = distance_from_bottom;
+			bottom = null;
+		} else {
+			bottom = `${distance_from_bottom + input_height}px`;
+			max_height = distance_from_top - input_height;
+			top = null;
+		}
+	}
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<svelte:window on:scroll={scroll_listener} bind:innerHeight />
+
+<div class="reference" bind:this={refElement} />
+{#if show_options && !disabled}
+	<ul
+		class="options"
+		transition:fly={{ duration: 200, y: 5 }}
+		on:mousedown|preventDefault={(e) => dispatch("change", e)}
+		
+		style:bottom
+		style:max-height={`calc(${max_height}px - var(--window-padding))`}
+		style:width={input_width + "px"}
+		bind:this={listElement}
+		role="listbox"
+	>
+		{#each filtered_indices as index}
+			<li
+				class="item"
+				class:selected={selected_indices.includes(index)}
+				class:active={index === active_index}
+				class:bg-gray-100={index === active_index}
+				class:dark:bg-gray-600={index === active_index}
+				data-index={index}
+				aria-label={choices[index][0]}
+				data-testid="dropdown-option"
+				role="option"
+				aria-selected={selected_indices.includes(index)}
+			>
+				<span class:hide={!selected_indices.includes(index)} class="inner-item">
+					✓
+				</span>
+				{choices[index][0]}
+			</li>
+		{/each}
+	</ul>
+{/if}
+
+<style>
+	.options {
+		--window-padding: var(--size-8);
+		position: fixed;
+		z-index: var(--layer-top);
+		margin-left: 0;
+		box-shadow: var(--shadow-drop-lg);
+		border-radius: var(--container-radius);
+		background: var(--background-fill-primary);
+		min-width: fit-content;
+		max-width: inherit;
+		overflow: auto;
+		color: var(--body-text-color);
+		list-style: none;
+	}
+
+	.item {
+		display: flex;
+		cursor: pointer;
+		padding: var(--size-2);
+	}
+
+	.item:hover,
+	.active {
+		background: var(--background-fill-secondary);
+	}
+
+	.inner-item {
+		padding-right: var(--size-1);
+	}
+
+	.hide {
+		visibility: hidden;
+	}
+</style>

src/frontend/shared/patched_dropdown/shared/Multiselect.svelte

@@ -1,416 +1,416 @@
-<script lang="ts">
-	import { afterUpdate, createEventDispatcher } from "svelte";
-	import { _, number } from "svelte-i18n";
-	import { BlockTitle } from "@gradio/atoms";
-	import { Remove, DropdownArrow } from "@gradio/icons";
-	import type { KeyUpData, SelectData, I18nFormatter } from "@gradio/utils";
-	import DropdownOptions from "./DropdownOptions.svelte";
-	import { handle_filter, handle_change, handle_shared_keys } from "./utils";
-
-	export let label: string;
-	export let info: string | undefined = undefined;
-	export let value: string | number | (string | number)[] | undefined = [];
-	let old_value: string | number | (string | number)[] | undefined = [];
-	export let value_is_output = false;
-	export let max_choices: number | null = null;
-	export let choices: [string, string | number][];
-	let old_choices: [string, string | number][];
-	export let disabled = false;
-	export let show_label: boolean;
-	export let container = true;
-	export let allow_custom_value = false;
-	export let filterable = true;
-	export let i18n: I18nFormatter;
-
-	let filter_input: HTMLElement;
-	let input_text = "";
-	let old_input_text = "";
-	let show_options = false;
-	let choices_names: string[];
-	let choices_values: (string | number)[];
-
-	// All of these are indices with respect to the choices array
-	let filtered_indices: number[] = [];
-	let active_index: number | null = null;
-	// selected_index consists of indices from choices or strings if allow_custom_value is true and user types in a custom value
-	let selected_indices: (number | string)[] = [];
-	let old_selected_index: (number | string)[] = [];
-
-	const dispatch = createEventDispatcher<{
-		change: string | string[] | undefined;
-		input: undefined;
-		select: SelectData;
-		blur: undefined;
-		focus: undefined;
-		key_up: KeyUpData;
-	}>();
-
-	// Setting the initial value of the multiselect dropdown
-	if (Array.isArray(value)) {
-		value.forEach((element) => {
-			const index = choices.map((c) => c[1]).indexOf(element);
-			if (index !== -1) {
-				selected_indices.push(index);
-			} else {
-				selected_indices.push(element);
-			}
-		});
-	}
-
-	$: {
-		choices_names = choices.map((c) => c[0]);
-		choices_values = choices.map((c) => c[1]);
-	}
-
-	$: {
-		if (choices !== old_choices || input_text !== old_input_text) {
-			filtered_indices = handle_filter(choices, input_text);
-			old_choices = choices;
-			old_input_text = input_text;
-			if (!allow_custom_value) {
-				active_index = filtered_indices[0];
-			}
-		}
-	}
-
-	$: {
-		if (JSON.stringify(value) != JSON.stringify(old_value)) {
-			handle_change(dispatch, value, value_is_output);
-			old_value = Array.isArray(value) ? value.slice() : value;
-		}
-	}
-
-	$: {
-		if (
-			JSON.stringify(selected_indices) != JSON.stringify(old_selected_index)
-		) {
-			value = selected_indices.map((index) =>
-				typeof index === "number" ? choices_values[index] : index
-			);
-			old_selected_index = selected_indices.slice();
-		}
-	}
-
-	function handle_blur(): void {
-		if (!allow_custom_value) {
-			input_text = "";
-		}
-
-		if (allow_custom_value && input_text !== "") {
-			add_selected_choice(input_text);
-			input_text = "";
-		}
-
-		show_options = false;
-		active_index = null;
-		dispatch("blur");
-	}
-
-	function remove_selected_choice(option_index: number | string): void {
-		selected_indices = selected_indices.filter((v) => v !== option_index);
-		dispatch("select", {
-			index: typeof option_index === "number" ? option_index : -1,
-			value:
-				typeof option_index === "number"
-					? choices_values[option_index]
-					: option_index,
-			selected: false
-		});
-	}
-
-	function add_selected_choice(option_index: number | string): void {
-		if (max_choices === null || selected_indices.length < max_choices) {
-			selected_indices = [...selected_indices, option_index];
-			dispatch("select", {
-				index: typeof option_index === "number" ? option_index : -1,
-				value:
-					typeof option_index === "number"
-						? choices_values[option_index]
-						: option_index,
-				selected: true
-			});
-		}
-		if (selected_indices.length === max_choices) {
-			show_options = false;
-			active_index = null;
-			filter_input.blur();
-		}
-	}
-
-	function handle_option_selected(e: any): void {
-		const option_index = parseInt(e.detail.target.dataset.index);
-		add_or_remove_index(option_index);
-	}
-
-	function add_or_remove_index(option_index: number): void {
-		if (selected_indices.includes(option_index)) {
-			remove_selected_choice(option_index);
-		} else {
-			add_selected_choice(option_index);
-		}
-		input_text = "";
-	}
-
-	function remove_all(e: any): void {
-		selected_indices = [];
-		input_text = "";
-		e.preventDefault();
-	}
-
-	function handle_focus(e: FocusEvent): void {
-		filtered_indices = choices.map((_, i) => i);
-		if (max_choices === null || selected_indices.length < max_choices) {
-			show_options = true;
-		}
-		dispatch("focus");
-	}
-
-	function handle_key_down(e: KeyboardEvent): void {
-		[show_options, active_index] = handle_shared_keys(
-			e,
-			active_index,
-			filtered_indices
-		);
-		if (e.key === "Enter") {
-			if (active_index !== null) {
-				add_or_remove_index(active_index);
-			} else {
-				if (allow_custom_value) {
-					add_selected_choice(input_text);
-					input_text = "";
-				}
-			}
-		}
-		if (e.key === "Backspace" && input_text === "") {
-			selected_indices = [...selected_indices.slice(0, -1)];
-		}
-		if (selected_indices.length === max_choices) {
-			show_options = false;
-			active_index = null;
-		}
-	}
-
-	function set_selected_indices(): void {
-		if (value === undefined) {
-			selected_indices = [];
-		} else if (Array.isArray(value)) {
-			selected_indices = value
-				.map((v) => {
-					const index = choices_values.indexOf(v);
-					if (index !== -1) {
-						return index;
-					}
-					if (allow_custom_value) {
-						return v;
-					}
-					// Instead of returning null, skip this iteration
-					return undefined;
-				})
-				.filter((val): val is string | number => val !== undefined);
-		}
-	}
-
-	$: value, set_selected_indices();
-
-	afterUpdate(() => {
-		value_is_output = false;
-	});
-</script>
-
-<label class:container>
-	<BlockTitle {show_label} {info}>{label}</BlockTitle>
-
-	<div class="wrap">
-		<div class="wrap-inner" class:show_options>
-			{#each selected_indices as s}
-				<div class="token">
-					<span>
-						{#if typeof s === "number"}
-							{choices_names[s]}
-						{:else}
-							{s}
-						{/if}
-					</span>
-					{#if !disabled}
-						<div
-							class="token-remove"
-							on:click|preventDefault={() => remove_selected_choice(s)}
-							on:keydown|preventDefault={(event) => {
-								if (event.key === "Enter") {
-									remove_selected_choice(s);
-								}
-							}}
-							role="button"
-							tabindex="0"
-							title={i18n("common.remove") + " " + s}
-						>
-							<Remove />
-						</div>
-					{/if}
-				</div>
-			{/each}
-			<div class="secondary-wrap">
-				<input
-					class="border-none"
-					class:subdued={(!choices_names.includes(input_text) &&
-						!allow_custom_value) ||
-						selected_indices.length === max_choices}
-					{disabled}
-					autocomplete="off"
-					bind:value={input_text}
-					bind:this={filter_input}
-					on:keydown={handle_key_down}
-					on:keyup={(e) =>
-						dispatch("key_up", {
-							key: e.key,
-							input_value: input_text
-						})}
-					on:blur={handle_blur}
-					on:focus={handle_focus}
-					readonly={!filterable}
-				/>
-
-				{#if !disabled}
-					{#if selected_indices.length > 0}
-						<div
-							role="button"
-							tabindex="0"
-							class="token-remove remove-all"
-							title={i18n("common.clear")}
-							on:click={remove_all}
-							on:keydown={(event) => {
-								if (event.key === "Enter") {
-									remove_all(event);
-								}
-							}}
-						>
-							<Remove />
-						</div>
-					{/if}
-					<span class="icon-wrap"> <DropdownArrow /></span>
-				{/if}
-			</div>
-		</div>
-		<DropdownOptions
-			{show_options}
-			{choices}
-			{filtered_indices}
-			{disabled}
-			{selected_indices}
-			{active_index}
-			on:change={handle_option_selected}
-		/>
-	</div>
-</label>
-
-<style>
-	.icon-wrap {
-		color: var(--body-text-color);
-		margin-right: var(--size-2);
-		width: var(--size-5);
-	}
-	label:not(.container),
-	label:not(.container) .wrap,
-	label:not(.container) .wrap-inner,
-	label:not(.container) .secondary-wrap,
-	label:not(.container) .token,
-	label:not(.container) input {
-		height: 100%;
-	}
-	.container .wrap {
-		box-shadow: var(--input-shadow);
-		border: var(--input-border-width) solid var(--border-color-primary);
-	}
-
-	.wrap {
-		position: relative;
-		border-radius: var(--input-radius);
-		background: var(--input-background-fill);
-	}
-
-	.wrap:focus-within {
-		box-shadow: var(--input-shadow-focus);
-		border-color: var(--input-border-color-focus);
-	}
-
-	.wrap-inner {
-		display: flex;
-		position: relative;
-		flex-wrap: wrap;
-		align-items: center;
-		gap: var(--checkbox-label-gap);
-		padding: var(--checkbox-label-padding);
-	}
-
-	.token {
-		display: flex;
-		align-items: center;
-		transition: var(--button-transition);
-		cursor: pointer;
-		box-shadow: var(--checkbox-label-shadow);
-		border: var(--checkbox-label-border-width) solid
-			var(--checkbox-label-border-color);
-		border-radius: var(--button-small-radius);
-		background: var(--checkbox-label-background-fill);
-		padding: var(--checkbox-label-padding);
-		color: var(--checkbox-label-text-color);
-		font-weight: var(--checkbox-label-text-weight);
-		font-size: var(--checkbox-label-text-size);
-		line-height: var(--line-md);
-	}
-
-	.token > * + * {
-		margin-left: var(--size-2);
-	}
-
-	.token-remove {
-		fill: var(--body-text-color);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		cursor: pointer;
-		border: var(--checkbox-border-width) solid var(--border-color-primary);
-		border-radius: var(--radius-full);
-		background: var(--background-fill-primary);
-		padding: var(--size-0-5);
-		width: 16px;
-		height: 16px;
-	}
-
-	.secondary-wrap {
-		display: flex;
-		flex: 1 1 0%;
-		align-items: center;
-		border: none;
-		min-width: min-content;
-	}
-
-	input {
-		margin: var(--spacing-sm);
-		outline: none;
-		border: none;
-		background: inherit;
-		width: var(--size-full);
-		color: var(--body-text-color);
-		font-size: var(--input-text-size);
-	}
-
-	input:disabled {
-		-webkit-text-fill-color: var(--body-text-color);
-		-webkit-opacity: 1;
-		opacity: 1;
-		cursor: not-allowed;
-	}
-
-	.remove-all {
-		margin-left: var(--size-1);
-		width: 20px;
-		height: 20px;
-	}
-	.subdued {
-		color: var(--body-text-color-subdued);
-	}
-	input[readonly] {
-		cursor: pointer;
-	}
-</style>
+<script lang="ts">
+	import { afterUpdate, createEventDispatcher } from "svelte";
+	import { _, number } from "svelte-i18n";
+	import { BlockTitle } from "@gradio/atoms";
+	import { Remove, DropdownArrow } from "@gradio/icons";
+	import type { KeyUpData, SelectData, I18nFormatter } from "@gradio/utils";
+	import DropdownOptions from "./DropdownOptions.svelte";
+	import { handle_filter, handle_change, handle_shared_keys } from "./utils";
+
+	export let label: string;
+	export let info: string | undefined = undefined;
+	export let value: string | number | (string | number)[] | undefined = [];
+	let old_value: string | number | (string | number)[] | undefined = [];
+	export let value_is_output = false;
+	export let max_choices: number | null = null;
+	export let choices: [string, string | number][];
+	let old_choices: [string, string | number][];
+	export let disabled = false;
+	export let show_label: boolean;
+	export let container = true;
+	export let allow_custom_value = false;
+	export let filterable = true;
+	export let i18n: I18nFormatter;
+
+	let filter_input: HTMLElement;
+	let input_text = "";
+	let old_input_text = "";
+	let show_options = false;
+	let choices_names: string[];
+	let choices_values: (string | number)[];
+
+	// All of these are indices with respect to the choices array
+	let filtered_indices: number[] = [];
+	let active_index: number | null = null;
+	// selected_index consists of indices from choices or strings if allow_custom_value is true and user types in a custom value
+	let selected_indices: (number | string)[] = [];
+	let old_selected_index: (number | string)[] = [];
+
+	const dispatch = createEventDispatcher<{
+		change: string | string[] | undefined;
+		input: undefined;
+		select: SelectData;
+		blur: undefined;
+		focus: undefined;
+		key_up: KeyUpData;
+	}>();
+
+	// Setting the initial value of the multiselect dropdown
+	if (Array.isArray(value)) {
+		value.forEach((element) => {
+			const index = choices.map((c) => c[1]).indexOf(element);
+			if (index !== -1) {
+				selected_indices.push(index);
+			} else {
+				selected_indices.push(element);
+			}
+		});
+	}
+
+	$: {
+		choices_names = choices.map((c) => c[0]);
+		choices_values = choices.map((c) => c[1]);
+	}
+
+	$: {
+		if (choices !== old_choices || input_text !== old_input_text) {
+			filtered_indices = handle_filter(choices, input_text);
+			old_choices = choices;
+			old_input_text = input_text;
+			if (!allow_custom_value) {
+				active_index = filtered_indices[0];
+			}
+		}
+	}
+
+	$: {
+		if (JSON.stringify(value) != JSON.stringify(old_value)) {
+			handle_change(dispatch, value, value_is_output);
+			old_value = Array.isArray(value) ? value.slice() : value;
+		}
+	}
+
+	$: {
+		if (
+			JSON.stringify(selected_indices) != JSON.stringify(old_selected_index)
+		) {
+			value = selected_indices.map((index) =>
+				typeof index === "number" ? choices_values[index] : index
+			);
+			old_selected_index = selected_indices.slice();
+		}
+	}
+
+	function handle_blur(): void {
+		if (!allow_custom_value) {
+			input_text = "";
+		}
+
+		if (allow_custom_value && input_text !== "") {
+			add_selected_choice(input_text);
+			input_text = "";
+		}
+
+		show_options = false;
+		active_index = null;
+		dispatch("blur");
+	}
+
+	function remove_selected_choice(option_index: number | string): void {
+		selected_indices = selected_indices.filter((v) => v !== option_index);
+		dispatch("select", {
+			index: typeof option_index === "number" ? option_index : -1,
+			value:
+				typeof option_index === "number"
+					? choices_values[option_index]
+					: option_index,
+			selected: false
+		});
+	}
+
+	function add_selected_choice(option_index: number | string): void {
+		if (max_choices === null || selected_indices.length < max_choices) {
+			selected_indices = [...selected_indices, option_index];
+			dispatch("select", {
+				index: typeof option_index === "number" ? option_index : -1,
+				value:
+					typeof option_index === "number"
+						? choices_values[option_index]
+						: option_index,
+				selected: true
+			});
+		}
+		if (selected_indices.length === max_choices) {
+			show_options = false;
+			active_index = null;
+			filter_input.blur();
+		}
+	}
+
+	function handle_option_selected(e: any): void {
+		const option_index = parseInt(e.detail.target.dataset.index);
+		add_or_remove_index(option_index);
+	}
+
+	function add_or_remove_index(option_index: number): void {
+		if (selected_indices.includes(option_index)) {
+			remove_selected_choice(option_index);
+		} else {
+			add_selected_choice(option_index);
+		}
+		input_text = "";
+	}
+
+	function remove_all(e: any): void {
+		selected_indices = [];
+		input_text = "";
+		e.preventDefault();
+	}
+
+	function handle_focus(e: FocusEvent): void {
+		filtered_indices = choices.map((_, i) => i);
+		if (max_choices === null || selected_indices.length < max_choices) {
+			show_options = true;
+		}
+		dispatch("focus");
+	}
+
+	function handle_key_down(e: KeyboardEvent): void {
+		[show_options, active_index] = handle_shared_keys(
+			e,
+			active_index,
+			filtered_indices
+		);
+		if (e.key === "Enter") {
+			if (active_index !== null) {
+				add_or_remove_index(active_index);
+			} else {
+				if (allow_custom_value) {
+					add_selected_choice(input_text);
+					input_text = "";
+				}
+			}
+		}
+		if (e.key === "Backspace" && input_text === "") {
+			selected_indices = [...selected_indices.slice(0, -1)];
+		}
+		if (selected_indices.length === max_choices) {
+			show_options = false;
+			active_index = null;
+		}
+	}
+
+	function set_selected_indices(): void {
+		if (value === undefined) {
+			selected_indices = [];
+		} else if (Array.isArray(value)) {
+			selected_indices = value
+				.map((v) => {
+					const index = choices_values.indexOf(v);
+					if (index !== -1) {
+						return index;
+					}
+					if (allow_custom_value) {
+						return v;
+					}
+					// Instead of returning null, skip this iteration
+					return undefined;
+				})
+				.filter((val): val is string | number => val !== undefined);
+		}
+	}
+
+	$: value, set_selected_indices();
+
+	afterUpdate(() => {
+		value_is_output = false;
+	});
+</script>
+
+<label class:container>
+	<BlockTitle {show_label} {info}>{label}</BlockTitle>
+
+	<div class="wrap">
+		<div class="wrap-inner" class:show_options>
+			{#each selected_indices as s}
+				<div class="token">
+					<span>
+						{#if typeof s === "number"}
+							{choices_names[s]}
+						{:else}
+							{s}
+						{/if}
+					</span>
+					{#if !disabled}
+						<div
+							class="token-remove"
+							on:click|preventDefault={() => remove_selected_choice(s)}
+							on:keydown|preventDefault={(event) => {
+								if (event.key === "Enter") {
+									remove_selected_choice(s);
+								}
+							}}
+							role="button"
+							tabindex="0"
+							title={i18n("common.remove") + " " + s}
+						>
+							<Remove />
+						</div>
+					{/if}
+				</div>
+			{/each}
+			<div class="secondary-wrap">
+				<input
+					class="border-none"
+					class:subdued={(!choices_names.includes(input_text) &&
+						!allow_custom_value) ||
+						selected_indices.length === max_choices}
+					{disabled}
+					autocomplete="off"
+					bind:value={input_text}
+					bind:this={filter_input}
+					on:keydown={handle_key_down}
+					on:keyup={(e) =>
+						dispatch("key_up", {
+							key: e.key,
+							input_value: input_text
+						})}
+					on:blur={handle_blur}
+					on:focus={handle_focus}
+					readonly={!filterable}
+				/>
+
+				{#if !disabled}
+					{#if selected_indices.length > 0}
+						<div
+							role="button"
+							tabindex="0"
+							class="token-remove remove-all"
+							title={i18n("common.clear")}
+							on:click={remove_all}
+							on:keydown={(event) => {
+								if (event.key === "Enter") {
+									remove_all(event);
+								}
+							}}
+						>
+							<Remove />
+						</div>
+					{/if}
+					<span class="icon-wrap"> <DropdownArrow /></span>
+				{/if}
+			</div>
+		</div>
+		<DropdownOptions
+			{show_options}
+			{choices}
+			{filtered_indices}
+			{disabled}
+			{selected_indices}
+			{active_index}
+			on:change={handle_option_selected}
+		/>
+	</div>
+</label>
+
+<style>
+	.icon-wrap {
+		color: var(--body-text-color);
+		margin-right: var(--size-2);
+		width: var(--size-5);
+	}
+	label:not(.container),
+	label:not(.container) .wrap,
+	label:not(.container) .wrap-inner,
+	label:not(.container) .secondary-wrap,
+	label:not(.container) .token,
+	label:not(.container) input {
+		height: 100%;
+	}
+	.container .wrap {
+		box-shadow: var(--input-shadow);
+		border: var(--input-border-width) solid var(--border-color-primary);
+	}
+
+	.wrap {
+		position: relative;
+		border-radius: var(--input-radius);
+		background: var(--input-background-fill);
+	}
+
+	.wrap:focus-within {
+		box-shadow: var(--input-shadow-focus);
+		border-color: var(--input-border-color-focus);
+	}
+
+	.wrap-inner {
+		display: flex;
+		position: relative;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: var(--checkbox-label-gap);
+		padding: var(--checkbox-label-padding);
+	}
+
+	.token {
+		display: flex;
+		align-items: center;
+		transition: var(--button-transition);
+		cursor: pointer;
+		box-shadow: var(--checkbox-label-shadow);
+		border: var(--checkbox-label-border-width) solid
+			var(--checkbox-label-border-color);
+		border-radius: var(--button-small-radius);
+		background: var(--checkbox-label-background-fill);
+		padding: var(--checkbox-label-padding);
+		color: var(--checkbox-label-text-color);
+		font-weight: var(--checkbox-label-text-weight);
+		font-size: var(--checkbox-label-text-size);
+		line-height: var(--line-md);
+	}
+
+	.token > * + * {
+		margin-left: var(--size-2);
+	}
+
+	.token-remove {
+		fill: var(--body-text-color);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		cursor: pointer;
+		border: var(--checkbox-border-width) solid var(--border-color-primary);
+		border-radius: var(--radius-full);
+		background: var(--background-fill-primary);
+		padding: var(--size-0-5);
+		width: 16px;
+		height: 16px;
+	}
+
+	.secondary-wrap {
+		display: flex;
+		flex: 1 1 0%;
+		align-items: center;
+		border: none;
+		min-width: min-content;
+	}
+
+	input {
+		margin: var(--spacing-sm);
+		outline: none;
+		border: none;
+		background: inherit;
+		width: var(--size-full);
+		color: var(--body-text-color);
+		font-size: var(--input-text-size);
+	}
+
+	input:disabled {
+		-webkit-text-fill-color: var(--body-text-color);
+		-webkit-opacity: 1;
+		opacity: 1;
+		cursor: not-allowed;
+	}
+
+	.remove-all {
+		margin-left: var(--size-1);
+		width: 20px;
+		height: 20px;
+	}
+	.subdued {
+		color: var(--body-text-color-subdued);
+	}
+	input[readonly] {
+		cursor: pointer;
+	}
+</style>

src/frontend/shared/patched_dropdown/shared/utils.ts

@@ -1,56 +1,56 @@
-function positive_mod(n: number, m: number): number {
-	return ((n % m) + m) % m;
-}
-
-export function handle_filter(
-	choices: [string, string | number][],
-	input_text: string
-): number[] {
-	return choices.reduce((filtered_indices, o, index) => {
-		if (
-			input_text ? o[0].toLowerCase().includes(input_text.toLowerCase()) : true
-		) {
-			filtered_indices.push(index);
-		}
-		return filtered_indices;
-	}, [] as number[]);
-}
-
-export function handle_change(
-	dispatch: any,
-	value: string | number | (string | number)[] | undefined,
-	value_is_output: boolean
-): void {
-	dispatch("change", value);
-	if (!value_is_output) {
-		dispatch("input");
-	}
-}
-
-export function handle_shared_keys(
-	e: KeyboardEvent,
-	active_index: number | null,
-	filtered_indices: number[]
-): [boolean, number | null] {
-	if (e.key === "Escape") {
-		return [false, active_index];
-	}
-	if (e.key === "ArrowDown" || e.key === "ArrowUp") {
-		if (filtered_indices.length >= 0) {
-			if (active_index === null) {
-				active_index =
-					e.key === "ArrowDown"
-						? filtered_indices[0]
-						: filtered_indices[filtered_indices.length - 1];
-			} else {
-				const index_in_filtered = filtered_indices.indexOf(active_index);
-				const increment = e.key === "ArrowUp" ? -1 : 1;
-				active_index =
-					filtered_indices[
-						positive_mod(index_in_filtered + increment, filtered_indices.length)
-					];
-			}
-		}
-	}
-	return [true, active_index];
-}
+function positive_mod(n: number, m: number): number {
+	return ((n % m) + m) % m;
+}
+
+export function handle_filter(
+	choices: [string, string | number][],
+	input_text: string
+): number[] {
+	return choices.reduce((filtered_indices, o, index) => {
+		if (
+			input_text ? o[0].toLowerCase().includes(input_text.toLowerCase()) : true
+		) {
+			filtered_indices.push(index);
+		}
+		return filtered_indices;
+	}, [] as number[]);
+}
+
+export function handle_change(
+	dispatch: any,
+	value: string | number | (string | number)[] | undefined,
+	value_is_output: boolean
+): void {
+	dispatch("change", value);
+	if (!value_is_output) {
+		dispatch("input");
+	}
+}
+
+export function handle_shared_keys(
+	e: KeyboardEvent,
+	active_index: number | null,
+	filtered_indices: number[]
+): [boolean, number | null] {
+	if (e.key === "Escape") {
+		return [false, active_index];
+	}
+	if (e.key === "ArrowDown" || e.key === "ArrowUp") {
+		if (filtered_indices.length >= 0) {
+			if (active_index === null) {
+				active_index =
+					e.key === "ArrowDown"
+						? filtered_indices[0]
+						: filtered_indices[filtered_indices.length - 1];
+			} else {
+				const index_in_filtered = filtered_indices.indexOf(active_index);
+				const increment = e.key === "ArrowUp" ? -1 : 1;
+				active_index =
+					filtered_indices[
+						positive_mod(index_in_filtered + increment, filtered_indices.length)
+					];
+			}
+		}
+	}
+	return [true, active_index];
+}

src/frontend/shared/utils.ts

@@ -1,29 +1,29 @@
-export const get_coordinates_of_clicked_image = (
-	evt: MouseEvent
-): [number, number] | null => {
-	let image;
-	if (evt.currentTarget instanceof Element) {
-		image = evt.currentTarget.querySelector("img") as HTMLImageElement;
-	} else {
-		return [NaN, NaN];
-	}
-
-	const imageRect = image.getBoundingClientRect();
-	const xScale = image.naturalWidth / imageRect.width;
-	const yScale = image.naturalHeight / imageRect.height;
-	if (xScale > yScale) {
-		const displayed_height = image.naturalHeight / xScale;
-		const y_offset = (imageRect.height - displayed_height) / 2;
-		var x = Math.round((evt.clientX - imageRect.left) * xScale);
-		var y = Math.round((evt.clientY - imageRect.top - y_offset) * xScale);
-	} else {
-		const displayed_width = image.naturalWidth / yScale;
-		const x_offset = (imageRect.width - displayed_width) / 2;
-		var x = Math.round((evt.clientX - imageRect.left - x_offset) * yScale);
-		var y = Math.round((evt.clientY - imageRect.top) * yScale);
-	}
-	if (x < 0 || x >= image.naturalWidth || y < 0 || y >= image.naturalHeight) {
-		return null;
-	}
-	return [x, y];
-};
+export const get_coordinates_of_clicked_image = (
+	evt: MouseEvent
+): [number, number] | null => {
+	let image;
+	if (evt.currentTarget instanceof Element) {
+		image = evt.currentTarget.querySelector("img") as HTMLImageElement;
+	} else {
+		return [NaN, NaN];
+	}
+
+	const imageRect = image.getBoundingClientRect();
+	const xScale = image.naturalWidth / imageRect.width;
+	const yScale = image.naturalHeight / imageRect.height;
+	if (xScale > yScale) {
+		const displayed_height = image.naturalHeight / xScale;
+		const y_offset = (imageRect.height - displayed_height) / 2;
+		var x = Math.round((evt.clientX - imageRect.left) * xScale);
+		var y = Math.round((evt.clientY - imageRect.top - y_offset) * xScale);
+	} else {
+		const displayed_width = image.naturalWidth / yScale;
+		const x_offset = (imageRect.width - displayed_width) / 2;
+		var x = Math.round((evt.clientX - imageRect.left - x_offset) * yScale);
+		var y = Math.round((evt.clientY - imageRect.top) * yScale);
+	}
+	if (x < 0 || x >= image.naturalWidth || y < 0 || y >= image.naturalHeight) {
+		return null;
+	}
+	return [x, y];
+};

src/package.json

@@ -1,5 +1,5 @@
-{
-  "devDependencies": {
-    "@gradio/preview": "^0.9.0"
-  }
-}
+{
+  "devDependencies": {
+    "@gradio/preview": "^0.9.0"
+  }
+}

src/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "gradio_image_annotation"
-version = "0.4.0"
+version = "0.4.1"
 description = "A Gradio component that can be used to annotate images with bounding boxes."
 readme = "README.md"
 license = "MIT"
@@ -40,7 +40,7 @@ Issues = "https://github.com/edgarGracia/gradio_image_annotator/issues"
 dev = ["build", "twine"]
 
 [tool.hatch.build]
-artifacts = ["/backend/gradio_image_annotation/templates", "*.pyi", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates"]
+artifacts = ["/backend/gradio_image_annotation/templates", "*.pyi", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "backend/gradio_image_annotation/templates", "/\\backend\\gradio_image_annotation\\templates"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["/backend/gradio_image_annotation"]