papayaui 0.3.2 → 0.3.4

package/components/badge/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 
 export const badgeProps = {
   /**
@@ -46,3 +46,4 @@ export const badgeProps = {
 }
 
 export type BadgeProps = ExtractPropTypes<typeof badgeProps>
+export type BadgePropsPublic = ExtractPublicPropTypes<typeof badgeProps>

package/components/bottom-popup/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 import { pick } from '../../utils'
 import { popupEmits, popupProps } from '../popup/props'
 
@@ -49,4 +49,6 @@ export const bottomPopupEmits = {
 }
 
 export type BottomPopupProps = ExtractPropTypes<typeof bottomPopupProps>
+export type BottomPopupPropsPublic = ExtractPublicPropTypes<typeof bottomPopupProps>
+
 export type BottomPopupEmits = typeof bottomPopupEmits

package/components/button/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 
 export const buttonProps = {
   /**
@@ -142,4 +142,6 @@ export const buttonEmits = {
 }
 
 export type ButtonProps = ExtractPropTypes<typeof buttonProps>
+export type ButtonPropsPublic = ExtractPublicPropTypes<typeof buttonProps>
+
 export type ButtonEmits = typeof buttonEmits

package/components/calendar/props.ts

@@ -1,5 +1,5 @@
 import type { Dayjs } from 'dayjs'
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { DayItem, FirstDayOfWeekType } from '../../core/useCalendar'
 import { isArray, isDate, isObject, pick } from '../../utils'
 import { popupEmits, popupProps } from '../popup/props'
@@ -169,6 +169,10 @@ export const calendarEmits = {
 }
 
 export type CalendarProps = ExtractPropTypes<typeof calendarProps>
+export type CalendarPropsPublic = ExtractPublicPropTypes<typeof calendarProps>
+
 export type CalendarWrapperProps = ExtractPropTypes<typeof calendarWrapperProps>
+export type CalendarWrapperPropsPublic = ExtractPublicPropTypes<typeof calendarWrapperProps>
+
 export type CalendarEmits = typeof calendarEmits
 export type CalendarWrapperEmits = typeof calendarWrapperEmits

package/components/cascader/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { TreeNode, UseTreeFieldNames } from '../../core/useTree'
 import { defaultFieldNames } from '../../core/useTree'
 import { isArray, isObject } from '../../utils'
@@ -162,7 +162,11 @@ export const cascaderSearchViewEmits = {
 }
 
 export type CascaderProps = ExtractPropTypes<typeof cascaderProps>
+export type CascaderPropsPublic = ExtractPublicPropTypes<typeof cascaderProps>
+
 export type CascaderEmits = typeof cascaderEmits
 
 export type CascaderSearchViewProps = ExtractPropTypes<typeof cascaderSearchViewProps>
+export type CascaderSearchViewPropsPublic = ExtractPublicPropTypes<typeof cascaderSearchViewProps>
+
 export type CascaderSearchViewEmits = typeof cascaderSearchViewEmits

package/components/cell/cell.scss

@@ -60,8 +60,8 @@
 
   &__error-message {
     color: _var(color-error);
-    font-size: 12px;
-    text-align: left;
+    font-size: _var(cell-error-message-font-size, 12px);
+    text-align: _var(cell-error-message-text-align, left);
   }
 
   &--hover {
@@ -74,9 +74,9 @@
 
   &--required::before {
     position: absolute;
-    left: 8px;
-    color: #ee0a24;
-    font-size: 14px;
+    left: _var(cell-required-left, 8px);
+    color: _var(cell-required-color, #ee0a24);
+    font-size: _var(cell-required-font-size, 14px);
     content: '*';
   }
 
@@ -88,7 +88,7 @@
     right: _var(cell-padding-x, $padding-x);
     bottom: 0;
     left: _var(cell-padding-x, $padding-x);
-    border-bottom: 1px solid #ebedf0;
+    border-bottom: 1px solid _var(cell-border-bottom-color, #ebedf0);
     -webkit-transform: scaleY(0.5);
     transform: scaleY(0.5);
   }

package/components/cell/props.ts

@@ -1,5 +1,5 @@
 import { getGlobalOptions } from '../../utils/config'
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { getCurrentInstance } from 'vue'
 
 export const cellProps = {
@@ -93,4 +93,6 @@ export const cellEmits = {
 }
 
 export type CellProps = ExtractPropTypes<typeof cellProps>
+export type CellPropsPublic = ExtractPublicPropTypes<typeof cellProps>
+
 export type CellEmits = typeof cellEmits

package/components/cell-group/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 
 export const cellGroupProps = {
   /**
@@ -8,3 +8,4 @@ export const cellGroupProps = {
 }
 
 export type CellGroupProps = ExtractPropTypes<typeof cellGroupProps>
+export type CellGroupPropsPublic = ExtractPublicPropTypes<typeof cellGroupProps>

package/components/checkbox/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isBoolean, isUndefined } from '../../utils'
 
 export const checkboxProps = {
@@ -60,4 +60,6 @@ export const checkboxEmits = {
 export type CheckboxValue = string | number | boolean
 
 export type CheckboxProps = ExtractPropTypes<typeof checkboxProps>
+export type CheckboxPropsPublic = ExtractPublicPropTypes<typeof checkboxProps>
+
 export type CheckboxEmits = typeof checkboxEmits

package/components/checkbox-btns/checkbox-btns.scss

@@ -14,5 +14,9 @@
       background-color: _var(checkbox-btns-active-background, rgba(0, 156, 93, 0.1)) !important;
       border-color: _var(checkbox-btns-active-border-color, _var(color-primary)) !important;
     }
+    &.disabled {
+      opacity: _var(checkbox-btns-disabled-opacity, 0.8);
+      cursor: not-allowed;
+    }
   }
 }

package/components/checkbox-btns/checkbox-btns.vue

@@ -11,6 +11,7 @@
         ns.b('button'),
         {
           active: typeof modelValue !== 'undefined' ? isSelected(item[valueKey]) : false,
+          disabled: disabled,
         },
       ]"
       :style="
@@ -57,6 +58,7 @@ const {
 })
 
 const onSelect = (item: CheckboxItem, index: number) => {
+  if (props.disabled) return
   _onSelect(item[valueKey.value])
   emit('update:modelValue', selectedValues.value)
   emit('change', selectedItems.value, index)

package/components/checkbox-btns/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isNumber } from '../../utils'
 
 export type CheckboxItem = any
@@ -72,6 +72,13 @@ export const checkboxButtonsProps = {
     type: Boolean,
     default: true,
   },
+  /**
+   * 是否禁用
+   */
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
 }
 
 export const checkboxButtonsEmits = {
@@ -80,4 +87,6 @@ export const checkboxButtonsEmits = {
 }
 
 export type CheckboxButtonsProps = ExtractPropTypes<typeof checkboxButtonsProps>
+export type CheckboxButtonsPropsPublic = ExtractPublicPropTypes<typeof checkboxButtonsProps>
+
 export type CheckboxButtonsEmits = typeof checkboxButtonsEmits

package/components/checkbox-group/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { CheckboxValue } from '../checkbox/props'
 import { isArray, isString } from '../../utils'
 
@@ -37,4 +37,6 @@ export const checkboxGroupEmits = {
 }
 
 export type CheckboxGroupProps = ExtractPropTypes<typeof checkboxGroupProps>
+export type CheckboxGroupPropsPublic = ExtractPublicPropTypes<typeof checkboxGroupProps>
+
 export type CheckboxGroupEmits = typeof checkboxGroupEmits

package/components/circle/circle.vue

@@ -55,7 +55,7 @@ watch(
 )
 
 const initMP = () => {
-  const ratio = uni.getSystemInfoSync().pixelRatio
+  const ratio = uni.getWindowInfo().pixelRatio
   const query = uni.createSelectorQuery()
   query
     .in(instance)

package/components/circle/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 
 export const circleProps = {
   /**
@@ -57,3 +57,4 @@ export const circleProps = {
 }
 
 export type CircleProps = ExtractPropTypes<typeof circleProps>
+export type CirclePropsPublic = ExtractPublicPropTypes<typeof circleProps>

package/components/collapse/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType, Ref } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType, Ref } from 'vue'
 import { isUndefined } from '../../utils'
 import type { CollapseItemInstance, CollapseItemValue } from '../collapse-item/props'
 
@@ -28,6 +28,8 @@ export const collapseEmits = {
 }
 
 export type CollapseProps = ExtractPropTypes<typeof collapseProps>
+export type CollapsePropsPublic = ExtractPublicPropTypes<typeof collapseProps>
+
 export type CollapseEmits = typeof collapseEmits
 
 export type CollapseExpose = {

package/components/collapse-item/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType, Ref } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType, Ref } from 'vue'
 
 export const collapseItemProps = {
   /**
@@ -50,6 +50,7 @@ export const collapseItemProps = {
 export type CollapseItemValue = string | number
 
 export type CollapseItemProps = ExtractPropTypes<typeof collapseItemProps>
+export type CollapseItemPropsPublic = ExtractPublicPropTypes<typeof collapseItemProps>
 
 export interface CollapseItemInstance {
   /** 唯一标识符 */

package/components/container/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 import { watermarkProps } from '../watermark/props'
 
 export const containerProps = {
@@ -56,3 +56,4 @@ export const containerProps = {
 }
 
 export type ContainerProps = ExtractPropTypes<typeof containerProps>
+export type ContainerPropsPublic = ExtractPublicPropTypes<typeof containerProps>

package/components/count-down/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 import { isObject } from '../../utils'
 
 export type CountDownDuration = {
@@ -50,4 +50,6 @@ export const countDownEmits = {
 }
 
 export type CountDownProps = ExtractPropTypes<typeof countDownProps>
+export type CountDownPropsPublic = ExtractPublicPropTypes<typeof countDownProps>
+
 export type CountDownEmits = typeof countDownEmits

package/components/count-to/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType, CSSProperties } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType, CSSProperties } from 'vue'
 import { isNumber, isObject } from '../../utils'
 
 export const countToProps = {
@@ -62,4 +62,6 @@ export const countToEmits = {
 }
 
 export type CountToProps = ExtractPropTypes<typeof countToProps>
+export type CountToPropsPublic = ExtractPublicPropTypes<typeof countToProps>
+
 export type CountToEmits = typeof countToEmits

package/components/date-picker/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type {
   DatePickerColumnType,
   DatePickerFilter,
@@ -101,4 +101,6 @@ export const datePickerEmits = {
 export type ColumnItem = string | Record<string, any>
 
 export type DatePickerProps = ExtractPropTypes<typeof datePickerProps>
+export type DatePickerPropsPublic = ExtractPublicPropTypes<typeof datePickerProps>
+
 export type DatePickerEmits = typeof datePickerEmits

package/components/dialog/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { pick } from '../../utils'
 import { popupEmits, popupProps } from '../popup'
 
@@ -74,4 +74,6 @@ export const dialogEmits = {
 }
 
 export type DialogProps = ExtractPropTypes<typeof dialogProps>
+export type DialogPropsPublic = ExtractPublicPropTypes<typeof dialogProps>
+
 export type DialogEmits = typeof dialogEmits

package/components/empty/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 
 export const emptyProps = {
   /**
@@ -18,3 +18,4 @@ export const emptyProps = {
 }
 
 export type EmptyProps = ExtractPropTypes<typeof emptyProps>
+export type EmptyPropsPublic = ExtractPublicPropTypes<typeof emptyProps>

package/components/env-view/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isString } from '../../utils'
 
 export const envViewProps = {
@@ -22,4 +22,6 @@ export interface EnvListItem {
 }
 
 export type EnvViewProps = ExtractPropTypes<typeof envViewProps>
+export type EnvViewPropsPublic = ExtractPublicPropTypes<typeof envViewProps>
+
 export type EnvViewEmits = typeof envViewEmits

package/components/field/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { EventDetail } from '../../types'
 import { isObject, isString, pick } from '../../utils'
 import { cellProps } from '../cell/props'
@@ -119,4 +119,6 @@ export const fieldEmits = {
 }
 
 export type FieldProps = ExtractPropTypes<typeof fieldProps>
+export type FieldPropsPublic = ExtractPublicPropTypes<typeof fieldProps>
+
 export type FieldEmits = typeof fieldEmits

package/components/form/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { FormRules } from '../../core/useForm'
 
 export const formProps = {
@@ -23,4 +23,6 @@ export const formEmits = {
 }
 
 export type FormProps = ExtractPropTypes<typeof formProps>
+export type FormPropsPublic = ExtractPublicPropTypes<typeof formProps>
+
 export type FormEmits = typeof formEmits

package/components/form-item/form-item.vue

@@ -24,12 +24,12 @@ import type { ComponentInternalInstance, Ref } from 'vue'
 import { getCurrentInstance, inject, ref } from 'vue'
 import { defaultNamespace } from '../../core'
 import Cell from '../cell/cell.vue'
-import type { FormItemProps } from './props'
+import type { FormItemPropsPublic } from './props'
 import { formItemEmits, formItemProps } from './props'
 
 export interface FormItemInstance extends Omit<ComponentInternalInstance, 'props'> {
   errorMessage: Ref<string>
-  props: FormItemProps
+  props: FormItemPropsPublic
 }
 
 defineProps(formItemProps)

package/components/form-item/props.ts

@@ -1,10 +1,10 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { FormRuleItem } from '../../core/useForm'
 import { pick } from '../../utils'
 import { cellProps } from '../cell'
 
 export const formItemProps = {
-  ...pick(cellProps, ['titleWidth', 'suffix']),
+  ...pick(cellProps, ['titleWidth', 'suffix', 'value']),
   /**
    * 校验对应的字段名
    */
@@ -28,4 +28,6 @@ export const formItemEmits = {
 }
 
 export type FormItemProps = ExtractPropTypes<typeof formItemProps>
+export type FormItemPropsPublic = ExtractPublicPropTypes<typeof formItemProps>
+
 export type FormItemEmits = typeof formItemEmits

package/components/icon/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isObject } from '../../utils'
 
 export const iconProps = {
@@ -37,4 +37,6 @@ export const iconEmits = {
 }
 
 export type IconProps = ExtractPropTypes<typeof iconProps>
+export type IconPropsPublic = ExtractPublicPropTypes<typeof iconProps>
+
 export type IconEmits = typeof iconEmits

package/components/image/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 
 export const imageProps = {
   /**
@@ -46,4 +46,6 @@ export const imageEmits = {
 }
 
 export type ImageProps = ExtractPropTypes<typeof imageProps>
+export type ImagePropsPublic = ExtractPublicPropTypes<typeof imageProps>
+
 export type ImageEmits = typeof imageEmits

package/components/index-anchor/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'
 
 export const indexAnchorProps = {
   /**
@@ -11,3 +11,4 @@ export const indexAnchorProps = {
 }
 
 export type IndexAnchorProps = ExtractPropTypes<typeof indexAnchorProps>
+export type IndexAnchorPropsPublic = ExtractPublicPropTypes<typeof indexAnchorProps>

package/components/index-bar/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 
 export const indexBarProps = {
   /**
@@ -32,3 +32,4 @@ export const indexBarProps = {
 }
 
 export type IndexBarProps = ExtractPropTypes<typeof indexBarProps>
+export type IndexBarPropsPublic = ExtractPublicPropTypes<typeof indexBarProps>

package/components/input/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isString } from '../../utils'
 import { cellProps } from '../cell'
 
@@ -121,4 +121,6 @@ export const inputEmits = {
 }
 
 export type InputProps = ExtractPropTypes<typeof inputProps>
+export type InputPropsPublic = ExtractPublicPropTypes<typeof inputProps>
+
 export type InputEmits = typeof inputEmits

package/components/input-number/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { InputNumberValue } from '../../core/useInputNumber'
 import type { EventDetail } from '../../types'
 import { isObject } from '../../utils'
@@ -120,4 +120,6 @@ export const inputNumberEmits = {
 }
 
 export type InputNumberProps = ExtractPropTypes<typeof inputNumberProps>
+export type InputNumberPropsPublic = ExtractPublicPropTypes<typeof inputNumberProps>
+
 export type InputNumberEmits = typeof inputNumberEmits

package/components/list/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { LoadStatus } from '../loadmore/props'
 
 export const listProps = {
@@ -16,3 +16,4 @@ export const listProps = {
 }
 
 export type ListProps = ExtractPropTypes<typeof listProps>
+export type ListPropsPublic = ExtractPublicPropTypes<typeof listProps>

package/components/list-item/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, CSSProperties, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, CSSProperties, PropType } from 'vue'
 
 export const listItemProps = {
   /**
@@ -34,4 +34,6 @@ export const listItemEmits = {
 }
 
 export type ListItemProps = ExtractPropTypes<typeof listItemProps>
+export type ListItemPropsPublic = ExtractPublicPropTypes<typeof listItemProps>
+
 export type ListItemEmits = typeof listItemEmits

package/components/loading-icon/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 
 export const loadingIconProps = {
   /**
@@ -12,3 +12,4 @@ export const loadingIconProps = {
 }
 
 export type LoadingIconProps = ExtractPropTypes<typeof loadingIconProps>
+export type LoadingIconPropsPublic = ExtractPublicPropTypes<typeof loadingIconProps>

package/components/loadmore/props.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, ExtractPropTypes, PropType } from 'vue'
+import type { CSSProperties, ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import type { LoadStatusEnum } from '../../core'
 import { defaultNamespace } from '../../core/useNamespace'
 
@@ -55,4 +55,6 @@ export const loadMoreEmits = {
 export type LoadStatus = Record<LoadStatusEnum, string>
 
 export type LoadMoreProps = ExtractPropTypes<typeof loadMoreProps>
+export type LoadMorePropsPublic = ExtractPublicPropTypes<typeof loadMoreProps>
+
 export type LoadMoreEmits = typeof loadMoreEmits

package/components/menu/menu.vue

@@ -34,7 +34,7 @@ const ns = useNamespace('menu')
 
 const props = defineProps(menuProps)
 
-const systemInfo = uni.getSystemInfoSync()
+const systemInfo = uni.getWindowInfo()
 const instance = getCurrentInstance()
 
 const children = ref<MenuItemInstance[]>([])

package/components/menu/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { pick } from '../../utils'
 import { transitionProps } from '../transition/props'
 import { popupProps } from '../popup/props'
@@ -29,3 +29,4 @@ export const menuProps = {
 }
 
 export type MenuProps = ExtractPropTypes<typeof menuProps>
+export type MenuPropsPublic = ExtractPublicPropTypes<typeof menuProps>

package/components/menu-item/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isNumber, isString } from '../../utils'
 
 export const menuItemProps = {
@@ -50,4 +50,6 @@ export interface MenuItemOption {
 export type MenuItemOptionValue = number | string
 
 export type MenuItemProps = ExtractPropTypes<typeof menuItemProps>
+export type MenuItemPropsPublic = ExtractPublicPropTypes<typeof menuItemProps>
+
 export type MenuItemEmits = typeof menuItemEmits

package/components/nav-bar/nav-bar.vue

@@ -4,7 +4,7 @@
       ns.b(),
       ns.m(theme),
       ns.is('single', leftMenu.length === 1),
-      ns.is('development', systemInfo.platform === 'devtools'),
+      ns.is('development', deviceInfo.platform === 'devtools'),
     ]"
     :style="{ backgroundColor: bgColor, paddingTop: getUnitValue(statusBarHeight, 'px') }"
   >
@@ -32,13 +32,14 @@
 
 <script lang="ts" setup>
 import type { CSSProperties } from 'vue'
-import { computed, defineProps } from 'vue'
+import { computed } from 'vue'
 import useNamespace from '../../core/useNamespace'
 import { getUnitValue } from '../../utils'
 import IconComponent from '../icon/icon.vue'
 import { navBarEmits, navBarProps } from './props'
 
-const systemInfo = uni.getSystemInfoSync()
+const windowInfo = uni.getWindowInfo()
+const deviceInfo = uni.getDeviceInfo()
 let menuButtonInfo: UniApp.GetMenuButtonBoundingClientRectRes = {
   top: 0,
   left: 0,
@@ -57,11 +58,11 @@ const props = defineProps(navBarProps)
 const emit = defineEmits(navBarEmits)
 
 const statusBarHeight = computed(() => {
-  return props.safeAreaInsetTop ? (systemInfo.statusBarHeight as number) : 0
+  return props.safeAreaInsetTop ? (windowInfo.statusBarHeight as number) : 0
 })
 
 const contentHeight = computed(() => {
-  return systemInfo.platform === 'ios' ? 44 : 48
+  return deviceInfo.platform === 'ios' ? 44 : 48
 })
 
 const capsuleMenuStyle = computed<CSSProperties>(() => {

package/components/nav-bar/props.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue'
+import type { ExtractPropTypes, ExtractPublicPropTypes, PropType } from 'vue'
 import { isNumber } from '../../utils'
 
 export const navBarProps = {
@@ -43,4 +43,6 @@ export const navBarEmits = {
 }
 
 export type NavBarProps = ExtractPropTypes<typeof navBarProps>
+export type NavBarPropsPublic = ExtractPublicPropTypes<typeof navBarProps>
+
 export type NavBarEmits = typeof navBarEmits