feat: migrate Notify component

components.js

@@ -59,4 +59,5 @@ module.exports = [
   'uploader',
   'dropdown-menu',
   'dropdown-item',
+  'notify',
 ];

docs/markdown/changelog-v3.zh-CN.md

@@ -29,6 +29,7 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
 - ActionSheet
 - Calendar
 - Dialog
+- Notify
 - Popup
 - ShareSheet
 

src/notify/Notify.js

@@ -0,0 +1,44 @@
+import { createNamespace } from '../utils';
+import { popupMixinProps } from '../mixins/popup';
+import Popup from '../popup';
+
+const [createComponent, bem] = createNamespace('notify');
+
+export default createComponent({
+  props: {
+    ...popupMixinProps,
+    color: String,
+    message: [Number, String],
+    duration: [Number, String],
+    className: null,
+    background: String,
+    getContainer: [String, Function],
+    type: {
+      type: String,
+      default: 'danger',
+    },
+  },
+
+  setup(props, { slots }) {
+    return () => {
+      const style = {
+        color: props.color,
+        background: props.background,
+      };
+
+      return (
+        <Popup
+          show={props.show}
+          style={style}
+          position="top"
+          overlay={false}
+          duration={0.2}
+          lockScroll={false}
+          class={[bem([props.type]), props.className]}
+        >
+          {slots.default?.() || props.message}
+        </Popup>
+      );
+    };
+  },
+});

src/notify/Notify.tsx

@@ -1,68 +0,0 @@
-// Utils
-import { createNamespace } from '../utils';
-import { inherit } from '../utils/functional';
-
-// Mixins
-import { popupMixinProps } from '../mixins/popup';
-
-// Components
-import Popup from '../popup';
-
-// Types
-import { CreateElement, RenderContext } from 'vue/types';
-import { DefaultSlots } from '../utils/types';
-import { PopupMixinProps } from '../mixins/popup/type';
-
-export type NotifyProps = PopupMixinProps & {
-  type: 'primary' | 'success' | 'danger' | 'warning';
-  color: string;
-  message: number | string;
-  duration: number | string;
-  className?: any;
-  background: string;
-};
-
-const [createComponent, bem] = createNamespace('notify');
-
-function Notify(
-  h: CreateElement,
-  props: NotifyProps,
-  slots: DefaultSlots,
-  ctx: RenderContext<NotifyProps>
-) {
-  const style = {
-    color: props.color,
-    background: props.background,
-  };
-
-  return (
-    <Popup
-      value={props.value}
-      style={style}
-      position="top"
-      overlay={false}
-      duration={0.2}
-      lockScroll={false}
-      class={[bem([props.type]), props.className]}
-      {...inherit(ctx, true)}
-    >
-      {slots.default?.() || props.message}
-    </Popup>
-  );
-}
-
-Notify.props = {
-  ...popupMixinProps,
-  color: String,
-  message: [Number, String],
-  duration: [Number, String],
-  className: null as any,
-  background: String,
-  getContainer: [String, Function],
-  type: {
-    type: String,
-    default: 'danger',
-  },
-};
-
-export default createComponent<NotifyProps>(Notify);

src/notify/README.md

@@ -57,7 +57,7 @@ export default {
 
 ```html
 <van-button type="primary" text="Component Call" @click="showNotify" />
-<van-notify v-model="show" type="success">
+<van-notify v-model:show="show" type="success">
   <van-icon name="bell" style="margin-right: 4px;" />
   <span>Content</span>
 </van-notify>

src/notify/README.zh-CN.md

@@ -94,7 +94,7 @@ export default {
 
 ```html
 <van-button type="primary" text="组件调用" @click="showNotify" />
-<van-notify v-model="show" type="success">
+<van-notify v-model:show="show" type="success">
   <van-icon name="bell" style="margin-right: 4px;" />
   <span>通知内容</span>
 </van-notify>

src/notify/demo/index.vue

@@ -27,7 +27,7 @@
         @click="showComponentCall"
       />
 
-      <van-notify v-model="show" type="success">
+      <van-notify v-model:show="show" type="success">
         <van-icon name="bell" style="margin-right: 4px;" />
         <span>{{ t('content') }}</span>
       </van-notify>

src/notify/index.js

@@ -0,0 +1,110 @@
+import { createApp, nextTick } from 'vue';
+import VanNotify from './Notify';
+import { isObject, inBrowser } from '../utils';
+
+let timer;
+let instance;
+
+function parseOptions(message) {
+  return isObject(message) ? message : { message };
+}
+
+function initInstance() {
+  const root = document.createElement('div');
+  document.body.appendChild(root);
+
+  instance = createApp({
+    data() {
+      return {
+        notifyProps: {
+          show: false,
+        },
+      };
+    },
+    methods: {
+      toggle(show) {
+        this.notifyProps.show = show;
+      },
+      setProps(props) {
+        this.notifyProps = props;
+      },
+    },
+    render() {
+      return (
+        <VanNotify
+          {...{
+            ...this.notifyProps,
+            'onUpdate:show': this.toggle,
+          }}
+        />
+      );
+    },
+  }).mount(root);
+}
+
+function Notify(options) {
+  if (!inBrowser) {
+    return;
+  }
+
+  if (!instance) {
+    initInstance();
+  }
+
+  options = {
+    ...Notify.currentOptions,
+    ...parseOptions(options),
+  };
+
+  instance.setProps(options);
+  clearTimeout(timer);
+
+  if (options.duration && options.duration > 0) {
+    timer = setTimeout(Notify.clear, options.duration);
+  }
+
+  nextTick(() => {
+    instance.toggle(true);
+  });
+
+  return instance;
+}
+
+function defaultOptions() {
+  return {
+    type: 'danger',
+    message: '',
+    color: undefined,
+    background: undefined,
+    duration: 3000,
+    className: '',
+    onClose: null,
+    onClick: null,
+    onOpened: null,
+  };
+}
+
+Notify.clear = () => {
+  if (instance) {
+    instance.toggle(false);
+  }
+};
+
+Notify.currentOptions = defaultOptions();
+
+Notify.setDefaultOptions = (options) => {
+  Object.assign(Notify.currentOptions, options);
+};
+
+Notify.resetDefaultOptions = () => {
+  Notify.currentOptions = defaultOptions();
+};
+
+Notify.install = (app) => {
+  app.use(VanNotify);
+  app.config.globalProperties.$notify = Notify;
+};
+
+Notify.Component = VanNotify;
+
+export default Notify;

src/notify/index.ts

@@ -1,96 +0,0 @@
-import Vue from 'vue';
-import VanNotify from './Notify';
-import { isObject, isServer } from '../utils';
-import { mount } from '../utils/functional';
-import { NotifyOptions } from 'types/notify';
-
-let timer: number | NodeJS.Timeout;
-let instance: any;
-
-function parseOptions(message: NotifyOptions): NotifyOptions {
-  return isObject(message) ? message : { message };
-}
-
-function Notify(options: NotifyOptions) {
-  /* istanbul ignore if */
-  if (isServer) {
-    return;
-  }
-
-  if (!instance) {
-    instance = mount(VanNotify, {
-      on: {
-        click(event: Event) {
-          if (instance.onClick) {
-            instance.onClick(event);
-          }
-        },
-        close() {
-          if (instance.onClose) {
-            instance.onClose();
-          }
-        },
-        opened() {
-          if (instance.onOpened) {
-            instance.onOpened();
-          }
-        },
-      },
-    });
-  }
-
-  options = {
-    ...Notify.currentOptions,
-    ...parseOptions(options),
-  };
-
-  Object.assign(instance, options);
-  clearTimeout(timer as NodeJS.Timeout);
-
-  if (options.duration && options.duration > 0) {
-    timer = setTimeout(Notify.clear, options.duration);
-  }
-
-  return instance;
-}
-
-function defaultOptions(): NotifyOptions {
-  return {
-    type: 'danger',
-    value: true,
-    message: '',
-    color: undefined,
-    background: undefined,
-    duration: 3000,
-    className: '',
-    onClose: null,
-    onClick: null,
-    onOpened: null,
-  };
-}
-
-Notify.clear = () => {
-  if (instance) {
-    instance.value = false;
-  }
-};
-
-Notify.currentOptions = defaultOptions();
-
-Notify.setDefaultOptions = (options: NotifyOptions) => {
-  Object.assign(Notify.currentOptions, options);
-};
-
-Notify.resetDefaultOptions = () => {
-  Notify.currentOptions = defaultOptions();
-};
-
-Notify.install = () => {
-  Vue.use(VanNotify as any);
-};
-
-Notify.Component = VanNotify;
-
-Vue.prototype.$notify = Notify;
-
-export default Notify;

vant.config.js

@@ -196,10 +196,10 @@ module.exports = {
                 path: 'loading',
                 title: 'Loading 加载',
               },
-              // {
+              {
-              //   path: 'notify',
+                path: 'notify',
-              //   title: 'Notify 消息通知',
+                title: 'Notify 消息通知',
-              // },
+              },
               {
                 path: 'overlay',
                 title: 'Overlay 遮罩层',
@@ -530,10 +530,10 @@ module.exports = {
                 path: 'loading',
                 title: 'Loading',
               },
-              // {
+              {
-              //   path: 'notify',
+                path: 'notify',
-              //   title: 'Notify',
+                title: 'Notify',
-              // },
+              },
               {
                 path: 'overlay',
                 title: 'Overlay',