feat: resolve rest props

modelscope · Sep 25, 2024 · c49a8e1 · c49a8e1
1 parent 6a9d2fd
commit c49a8e1
Show file tree

Hide file tree

Showing 143 changed files with 523 additions and 281 deletions.
diff --git a/backend/modelscope_studio/components/antd/affix/__init__.py b/backend/modelscope_studio/components/antd/affix/__init__.py
@@ -20,6 +20,7 @@ def __init__(
  self,
  props: dict | None = None,
  *,
+ elem_target: str | None = None,
  as_item: str | None = None,
  _internal: None = None,
  # gradio properties
@@ -37,6 +38,7 @@ def __init__(
  elem_style=elem_style,
  **kwargs)
  self.props = props
+ self.elem_target = elem_target
 
  FRONTEND_DIR = resolve_frontend_dir("affix")
 

diff --git a/backend/modelscope_studio/components/antd/divider/__init__.py b/backend/modelscope_studio/components/antd/divider/__init__.py
@@ -2,8 +2,6 @@
 
 from typing import Any, Literal
 
-from gradio.events import EventListener
-
 from ....utils.dev import ModelScopeLayoutComponent, resolve_frontend_dir
 
 

diff --git a/backend/modelscope_studio/components/antd/float_button/back_top/__init__.py b/backend/modelscope_studio/components/antd/float_button/back_top/__init__.py
@@ -22,6 +22,7 @@ def __init__(
  self,
  props: dict | None = None,
  *,
+ elem_target: str | None = None,
  as_item: str | None = None,
  _internal: None = None,
  # gradio properties
@@ -39,6 +40,7 @@ def __init__(
  elem_style=elem_style,
  **kwargs)
  self.props = props
+ self.elem_target = elem_target
 
  FRONTEND_DIR = resolve_frontend_dir("float-button", "back-top")
 

diff --git a/backend/modelscope_studio/components/antd/icon/__init__.py b/backend/modelscope_studio/components/antd/icon/__init__.py
@@ -26,6 +26,9 @@ def __init__(
  value: str | None = "GithubOutlined",
  props: dict | None = None,
  *,
+ spin: bool = False,
+ rotate: int | float | None = None,
+ component: str | None = None,
  as_item: str | None = None,
  _internal: None = None,
  # gradio properties
@@ -44,6 +47,9 @@ def __init__(
  elem_style=elem_style,
  **kwargs)
  self.props = props
+ self.spin = spin
+ self.rotate = rotate
+ self.component = component
 
  FRONTEND_DIR = resolve_frontend_dir("icon")
 

diff --git a/backend/modelscope_studio/components/antd/icon/iconfont_provider/__init__.py b/backend/modelscope_studio/components/antd/icon/iconfont_provider/__init__.py
@@ -16,6 +16,7 @@ def __init__(
  script_url: str | list[str] | None = None,
  props: dict | None = None,
  *,
+ extra_common_props: dict | None = None,
  as_item: str | None = None,
  _internal: None = None,
  # gradio properties
@@ -27,6 +28,7 @@ def __init__(
  as_item=as_item,
  **kwargs)
  self.script_url = script_url
+ self.extra_common_props = extra_common_props
  self.props = props
 
  FRONTEND_DIR = resolve_frontend_dir("icon", "iconfont-provider")

diff --git a/frontend/antd/affix/Index.svelte b/frontend/antd/affix/Index.svelte
@@ -28,16 +28,22 @@
  export let elem_classes: string[] = [];
  export let elem_style: React.CSSProperties = {};
 
- const [mergedProps, update] = getSlotContext({
- gradio,
- props: $updatedProps,
- _internal,
- visible,
- elem_id,
- elem_classes,
- elem_style,
- as_item,
- });
+ const [mergedProps, update] = getSlotContext(
+ {
+ gradio,
+ props: $updatedProps,
+ _internal,
+ visible,
+ elem_id,
+ elem_classes,
+ elem_style,
+ as_item,
+ restProps: $$restProps,
+ },
+ {
+ elem_target: 'target',
+ }
+ );
  const slots = getSlots();
  $: update({
  gradio,
@@ -48,6 +54,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
 </script>
 
@@ -57,6 +64,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-affix')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/alert/Index.svelte b/frontend/antd/alert/Index.svelte
@@ -37,6 +37,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -48,6 +49,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
 </script>
 
@@ -57,6 +59,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-alert')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/alert/error-boundary/Index.svelte b/frontend/antd/alert/error-boundary/Index.svelte
@@ -39,6 +39,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -50,6 +51,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
 </script>
 
@@ -62,6 +64,7 @@
  'ms-gr-antd-alert-error-boundary'
  )}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/anchor/Index.svelte b/frontend/antd/anchor/Index.svelte
@@ -39,6 +39,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -50,6 +51,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const { items, default: children } = getItems(['items', 'default']);
 </script>
@@ -60,6 +62,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-anchor')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/anchor/item/Index.svelte b/frontend/antd/anchor/item/Index.svelte
@@ -40,6 +40,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -51,6 +52,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const setItem = getSetItemFn();
  const { default: items } = getItems();
@@ -59,6 +61,7 @@
  style: $mergedProps.elem_style,
  className: cls($mergedProps.elem_classes, 'ms-gr-antd-anchor-item'),
  id: $mergedProps.elem_id,
+ ...$mergedProps.restProps,
  ...$mergedProps.props,
  ...bindEvents($mergedProps),
  },

diff --git a/frontend/antd/auto-complete/Index.svelte b/frontend/antd/auto-complete/Index.svelte
@@ -40,6 +40,7 @@
  elem_style,
  as_item,
  value,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -52,6 +53,7 @@
  elem_style,
  as_item,
  value,
+ restProps: $$restProps,
  });
  const { options, default: children } = getItems(['options', 'default']);
 </script>
@@ -62,6 +64,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-auto-complete')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  value={$mergedProps.props.value ?? $mergedProps.value}

diff --git a/frontend/antd/auto-complete/option/Index.svelte b/frontend/antd/auto-complete/option/Index.svelte
@@ -44,6 +44,7 @@
  as_item,
  value,
  label,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -57,6 +58,7 @@
  as_item,
  value,
  label,
+ restProps: $$restProps,
  });
  const setItem = getSetItemFn();
  const { default: items, options } = getItems(['default', 'options']);
@@ -71,6 +73,7 @@
  id: $mergedProps.elem_id,
  value: $mergedProps.value,
  label: $mergedProps.label,
+ ...$mergedProps.restProps,
  ...$mergedProps.props,
  ...bindEvents($mergedProps),
  },

diff --git a/frontend/antd/avatar/Index.svelte b/frontend/antd/avatar/Index.svelte
@@ -39,6 +39,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -51,6 +52,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
 </script>
 
@@ -61,6 +63,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-avatar')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/avatar/group/Index.svelte b/frontend/antd/avatar/group/Index.svelte
@@ -37,6 +37,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -48,6 +49,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
 </script>
 
@@ -58,6 +60,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-avatar-group')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/badge/Index.svelte b/frontend/antd/badge/Index.svelte
@@ -39,6 +39,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -51,12 +52,14 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
 
  $: badge_props = {
  style: $mergedProps.elem_style,
  className: cls($mergedProps.elem_classes, 'ms-gr-antd-badge'),
  id: $mergedProps.elem_id,
+ ...$mergedProps.restProps,
  ...$mergedProps.props,
  ...bindEvents($mergedProps),
  slots: $slots,

diff --git a/frontend/antd/badge/ribbon/Index.svelte b/frontend/antd/badge/ribbon/Index.svelte
@@ -38,6 +38,7 @@
  elem_style,
  as_item,
  text,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -50,6 +51,7 @@
  elem_style,
  as_item,
  text,
+ restProps: $$restProps,
  });
 </script>
 
@@ -60,6 +62,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-badge-ribbon')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}

diff --git a/frontend/antd/breadcrumb/Index.svelte b/frontend/antd/breadcrumb/Index.svelte
@@ -39,6 +39,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const slots = getSlots();
  $: update({
@@ -50,6 +51,7 @@
  elem_classes,
  elem_style,
  as_item,
+ restProps: $$restProps,
  });
  const { items, default: children } = getItems(['items', 'default']);
 </script>
@@ -60,6 +62,7 @@
  style={$mergedProps.elem_style}
  className={cls($mergedProps.elem_classes, 'ms-gr-antd-breadcrumb')}
  id={$mergedProps.elem_id}
+ {...$mergedProps.restProps}
  {...$mergedProps.props}
  {...bindEvents($mergedProps)}
  slots={$slots}