From 5a15f947b0a7238655ac28ddd06ef758577d4b7f Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Fri, 11 Feb 2022 14:55:52 +0800 Subject: [PATCH] chore: rename props --- packages/uni-components/dist/components.js | 152 +++++++++--------- .../uni-components/src/components/label.ts | 2 +- .../src/components/movable-view/index.ts | 4 +- .../{movable-area.ts => movableArea.ts} | 4 +- .../{picker-view.ts => pickerView.ts} | 4 +- .../uni-components/src/nvue/label/index.tsx | 4 +- .../src/nvue/movable-area/index.tsx | 4 +- .../src/nvue/movable-view/index.tsx | 4 +- .../src/nvue/picker-view/index.tsx | 11 +- .../uni-components/src/vue/label/index.tsx | 4 +- .../src/vue/movable-area/index.tsx | 4 +- .../src/vue/movable-view/index.tsx | 4 +- .../src/vue/picker-view/index.tsx | 6 +- packages/uni-h5/dist/uni-h5.cjs.js | 58 +++---- packages/uni-h5/dist/uni-h5.es.js | 58 +++---- 15 files changed, 163 insertions(+), 160 deletions(-) rename packages/uni-components/src/components/{movable-area.ts => movableArea.ts} (51%) rename packages/uni-components/src/components/{picker-view.ts => pickerView.ts} (88%) diff --git a/packages/uni-components/dist/components.js b/packages/uni-components/dist/components.js index 7a6577cb8..e0f4440c2 100644 --- a/packages/uni-components/dist/components.js +++ b/packages/uni-components/dist/components.js @@ -45,53 +45,53 @@ const navigatorProps = { default: false } }; -function createNavigatorOnClick(props2) { +function createNavigatorOnClick(props) { return () => { - if (props2.openType !== "navigateBack" && !props2.url) { + if (props.openType !== "navigateBack" && !props.url) { console.error(" should have url attribute when using navigateTo, redirectTo, reLaunch or switchTab"); return; } - switch (props2.openType) { + switch (props.openType) { case "navigate": uni.navigateTo({ - url: props2.url + url: props.url }); break; case "redirect": uni.redirectTo({ - url: props2.url, - exists: props2.exists + url: props.url, + exists: props.exists }); break; case "switchTab": uni.switchTab({ - url: props2.url + url: props.url }); break; case "reLaunch": uni.reLaunch({ - url: props2.url + url: props.url }); break; case "navigateBack": uni.navigateBack({ - delta: props2.delta + delta: props.delta }); break; } }; } -function useHoverClass(props2) { - if (props2.hoverClass && props2.hoverClass !== "none") { - const hoverAttrs = { hoverClass: props2.hoverClass }; - if (hasOwn(props2, "hoverStartTime")) { - hoverAttrs.hoverStartTime = props2.hoverStartTime; +function useHoverClass(props) { + if (props.hoverClass && props.hoverClass !== "none") { + const hoverAttrs = { hoverClass: props.hoverClass }; + if (hasOwn(props, "hoverStartTime")) { + hoverAttrs.hoverStartTime = props.hoverStartTime; } - if (hasOwn(props2, "hoverStayTime")) { - hoverAttrs.hoverStayTime = props2.hoverStayTime; + if (hasOwn(props, "hoverStayTime")) { + hoverAttrs.hoverStayTime = props.hoverStayTime; } - if (hasOwn(props2, "hoverStopPropagation")) { - hoverAttrs.hoverStopPropagation = props2.hoverStopPropagation; + if (hasOwn(props, "hoverStopPropagation")) { + hoverAttrs.hoverStopPropagation = props.hoverStopPropagation; } return hoverAttrs; } @@ -110,12 +110,12 @@ var Navigator = defineComponent({ name: "Navigator", props: navigatorProps, styles: navigatorStyles, - setup(props2, { + setup(props, { slots }) { - const onClick = createNavigatorOnClick(props2); + const onClick = createNavigatorOnClick(props); return () => { - return createVNode("view", mergeProps(useHoverClass(props2), { + return createVNode("view", mergeProps(useHoverClass(props), { "onClick": onClick }), [slots.default && slots.default()]); }; @@ -127,7 +127,7 @@ function PolySymbol(name) { function useCurrentPageId() { return getCurrentInstance().root.proxy.$page.id; } -const props$2 = { +const labelProps = { for: { type: String, default: "" @@ -148,9 +148,9 @@ function useProvideLabel() { } var Label = /* @__PURE__ */ defineComponent({ name: "Label", - props: props$2, + props: labelProps, styles: [], - setup(props2, { + setup(props, { slots }) { const pageId = useCurrentPageId(); @@ -165,8 +165,8 @@ var Label = /* @__PURE__ */ defineComponent({ if (stopPropagation) { return; } - if (props2.for) { - UniViewJSBridge.emit(`uni-label-click-${pageId}-${props2.for}`, $event, true); + if (props.for) { + UniViewJSBridge.emit(`uni-label-click-${pageId}-${props.for}`, $event, true); } else { handlers.length && handlers[0]($event, true); } @@ -176,14 +176,14 @@ var Label = /* @__PURE__ */ defineComponent({ }, [slots.default && slots.default()]); } }); -function useListeners(props2, listeners) { - _addListeners(props2.id, listeners); - watch(() => props2.id, (newId, oldId) => { +function useListeners(props, listeners) { + _addListeners(props.id, listeners); + watch(() => props.id, (newId, oldId) => { _removeListeners(oldId, listeners, true); _addListeners(newId, listeners, true); }); onUnmounted(() => { - _removeListeners(props2.id, listeners); + _removeListeners(props.id, listeners); }); } function _addListeners(id, listeners, watch2) { @@ -467,14 +467,14 @@ var Button = defineComponent({ } }), styles: buttonStyle, - setup(props2, { + setup(props, { slots, attrs }) { - const type = props2.type; + const type = props.type; const rootRef = ref(null); const onClick = (e2, isLabelClick) => { - if (props2.disabled) { + if (props.disabled) { return; } if (isLabelClick) { @@ -483,17 +483,17 @@ var Button = defineComponent({ }; const _getClass = (t2) => { let cl = "ub-" + TYPES[type] + t2; - props2.disabled && (cl += "-d"); - props2.plain && (cl += "-plain"); - props2.size === "mini" && t2 === "-t" && (cl += " ub-mini"); + props.disabled && (cl += "-d"); + props.plain && (cl += "-plain"); + props.size === "mini" && t2 === "-t" && (cl += " ub-mini"); return cl; }; const _getHoverClass = (t2) => { - if (props2.disabled) { + if (props.disabled) { return ""; } let cl = "ub-" + TYPES[type] + t2 + "-hover"; - props2.plain && (cl += "-plain"); + props.plain && (cl += "-plain"); return cl; }; const uniLabel = inject(uniLabelKey, false); @@ -503,7 +503,7 @@ var Button = defineComponent({ uniLabel.removeHandler(onClick); }); } - useListeners(props2, { + useListeners(props, { "label-click": onClick }); const wrapSlots = () => { @@ -521,11 +521,11 @@ var Button = defineComponent({ return createVNode("div", mergeProps({ "ref": rootRef, "class": ["ub", _getClass("")] - }, extend({}, useHoverClass(props2), { + }, extend({}, useHoverClass(props), { hoverClass: _getHoverClass("") }), { "onClick": onClick - }), [props2.loading ? createVNode("loading-indicator", mergeProps({ + }), [props.loading ? createVNode("loading-indicator", mergeProps({ "class": ["ub-loading", `ub-${TYPES[type]}-loading`] }, { arrow: "false", @@ -534,7 +534,7 @@ var Button = defineComponent({ }; } }); -const props$1 = { +const movableAreaProps = { scaleArea: { type: Boolean, default: false @@ -567,14 +567,14 @@ const getComponentSize = (el) => { }; var MovableArea = defineComponent({ name: "MovableArea", - props: props$1, + props: movableAreaProps, styles: [{ "uni-movable-area": { width: "10px", height: "10px" } }], - setup(props2, { + setup(props, { slots }) { const width = ref(0); @@ -1060,7 +1060,7 @@ STD.prototype.reconfigure = function(e2, t2, n) { this._springY.reconfigure(e2, t2, n); this._springScale.reconfigure(e2, t2, n); }; -const props = { +const movableViewProps = { direction: { type: String, default: "none" @@ -1169,7 +1169,7 @@ function cancelAnimationFrame(id) { const animation = weex.requireModule("animation"); var MovableView = defineComponent({ name: "MovableView", - props, + props: movableViewProps, emits: ["change", "scale"], styles: [{ "uni-movable-view": { @@ -1180,7 +1180,7 @@ var MovableView = defineComponent({ height: "10px" } }], - setup(props2, { + setup(props, { emit, slots }) { @@ -1188,7 +1188,7 @@ var MovableView = defineComponent({ const trigger = useCustomEvent(rootRef, emit); const setTouchMovableViewContext = inject("setTouchMovableViewContext", () => { }); - useMovableViewState(props2, trigger, rootRef); + useMovableViewState(props, trigger, rootRef); const touchStart = () => { setTouchMovableViewContext({ touchstart, @@ -1209,7 +1209,7 @@ var MovableView = defineComponent({ }; } }); -function useMovableViewState(props2, trigger, rootRef) { +function useMovableViewState(props, trigger, rootRef) { const _isMounted = inject("_isMounted", ref(false)); const parentSize = inject("parentSize", { width: ref(0), @@ -1228,9 +1228,9 @@ function useMovableViewState(props2, trigger, rootRef) { val = Number(val); return isNaN(val) ? 1 : val; } - const xSync = ref(_getPx(props2.x)); - const ySync = ref(_getPx(props2.y)); - const scaleValueSync = ref(_getScaleNumber(Number(props2.scaleValue))); + const xSync = ref(_getPx(props.x)); + const ySync = ref(_getPx(props.y)); + const scaleValueSync = ref(_getScaleNumber(Number(props.scaleValue))); const width = ref(0); const height = ref(0); const minX = ref(0); @@ -1269,32 +1269,32 @@ function useMovableViewState(props2, trigger, rootRef) { historyT: [0, 0] }; const dampingNumber = computed(() => { - let val = Number(props2.damping); + let val = Number(props.damping); return isNaN(val) ? 20 : val; }); const frictionNumber = computed(() => { - let val = Number(props2.friction); + let val = Number(props.friction); return isNaN(val) || val <= 0 ? 2 : val; }); const scaleMinNumber = computed(() => { - let val = Number(props2.scaleMin); + let val = Number(props.scaleMin); return isNaN(val) ? 0.5 : val; }); const scaleMaxNumber = computed(() => { - let val = Number(props2.scaleMax); + let val = Number(props.scaleMax); return isNaN(val) ? 10 : val; }); - const xMove = computed(() => props2.direction === "all" || props2.direction === "horizontal"); - const yMove = computed(() => props2.direction === "all" || props2.direction === "vertical"); + const xMove = computed(() => props.direction === "all" || props.direction === "horizontal"); + const yMove = computed(() => props.direction === "all" || props.direction === "vertical"); const _STD = new STD(1, 9 * Math.pow(dampingNumber.value, 2) / 40, dampingNumber.value); const _friction = new Friction(1, frictionNumber.value); - watch(() => props2.x, (val) => { + watch(() => props.x, (val) => { xSync.value = _getPx(val); }); - watch(() => props2.y, (val) => { + watch(() => props.y, (val) => { ySync.value = _getPx(val); }); - watch(() => props2.scaleValue, (val) => { + watch(() => props.scaleValue, (val) => { scaleValueSync.value = _getScaleNumber(Number(val)); }); watch(xSync, _setX); @@ -1337,13 +1337,13 @@ function useMovableViewState(props2, trigger, rootRef) { return val; } function _setScaleMinOrMax() { - if (!props2.scale) { + if (!props.scale) { return false; } _updateScale(_scale, true); } function _setScaleValue(scale) { - if (!props2.scale) { + if (!props.scale) { return false; } scale = _adjustScale(scale); @@ -1352,7 +1352,7 @@ function useMovableViewState(props2, trigger, rootRef) { } function __handleTouchStart() { { - if (!props2.disabled) { + if (!props.disabled) { FAandSFACancel(); __touchInfo.historyX = [0, 0]; __touchInfo.historyY = [0, 0]; @@ -1370,7 +1370,7 @@ function useMovableViewState(props2, trigger, rootRef) { } } function __handleTouchMove(event) { - if (!props2.disabled && _isTouching) { + if (!props.disabled && _isTouching) { let x = _translateX; let y = _translateY; if (_firstMoveDirection === null) { @@ -1397,14 +1397,14 @@ function useMovableViewState(props2, trigger, rootRef) { if (!_checkCanMove) { let source = "touch"; if (x < minX.value) { - if (props2.outOfBounds) { + if (props.outOfBounds) { source = "touch-out-of-bounds"; x = minX.value - _declineX.x(minX.value - x); } else { x = minX.value; } } else if (x > maxX.value) { - if (props2.outOfBounds) { + if (props.outOfBounds) { source = "touch-out-of-bounds"; x = maxX.value + _declineX.x(x - maxX.value); } else { @@ -1412,7 +1412,7 @@ function useMovableViewState(props2, trigger, rootRef) { } } if (y < minY.value) { - if (props2.outOfBounds) { + if (props.outOfBounds) { source = "touch-out-of-bounds"; y = minY.value - _declineY.x(minY.value - y); } else { @@ -1420,7 +1420,7 @@ function useMovableViewState(props2, trigger, rootRef) { } } else { if (y > maxY.value) { - if (props2.outOfBounds) { + if (props.outOfBounds) { source = "touch-out-of-bounds"; y = maxY.value + _declineY.x(y - maxY.value); } else { @@ -1435,9 +1435,9 @@ function useMovableViewState(props2, trigger, rootRef) { } } function __handleTouchEnd() { - if (!props2.disabled && _isTouching) { + if (!props.disabled && _isTouching) { _isTouching = false; - if (!_checkCanMove && !_revise("out-of-bounds") && props2.inertia) { + if (!_checkCanMove && !_revise("out-of-bounds") && props.inertia) { const xv = 1e3 * (__touchInfo.historyX[1] - __touchInfo.historyX[0]) / (__touchInfo.historyT[1] - __touchInfo.historyT[0]); const yv = 1e3 * (__touchInfo.historyY[1] - __touchInfo.historyY[0]) / (__touchInfo.historyT[1] - __touchInfo.historyT[0]); _friction.setV(xv, yv); @@ -1527,7 +1527,7 @@ function useMovableViewState(props2, trigger, rootRef) { maxY.value = Math.max(y, _height); } function _updateScale(scale, animat) { - if (props2.scale) { + if (props.scale) { scale = _adjustScale(scale); _updateWH(scale); _updateBoundary(); @@ -1556,13 +1556,13 @@ function useMovableViewState(props2, trigger, rootRef) { if (!yMove.value) { y = _translateY; } - if (!props2.scale) { + if (!props.scale) { scale = _scale; } let limitXY = _getLimitXY(x, y); x = limitXY.x; y = limitXY.y; - if (!props2.animation) { + if (!props.animation) { _setTransform(x, y, scale, source, r, o); return; } @@ -1612,7 +1612,7 @@ function useMovableViewState(props2, trigger, rootRef) { }); } } - if (!props2.scale) { + if (!props.scale) { scale = _scale; } scale = _adjustScale(scale); @@ -1646,7 +1646,7 @@ function useMovableViewState(props2, trigger, rootRef) { return; } FAandSFACancel(); - let scale = props2.scale ? scaleValueSync.value : 1; + let scale = props.scale ? scaleValueSync.value : 1; _updateOffset(); _updateWH(scale); _updateBoundary(); diff --git a/packages/uni-components/src/components/label.ts b/packages/uni-components/src/components/label.ts index cf7a05ab6..980b7ff58 100644 --- a/packages/uni-components/src/components/label.ts +++ b/packages/uni-components/src/components/label.ts @@ -1,6 +1,6 @@ import { provide } from 'vue' import { PolySymbol } from '@dcloudio/uni-core' -export const props = { +export const labelProps = { for: { type: String, default: '', diff --git a/packages/uni-components/src/components/movable-view/index.ts b/packages/uni-components/src/components/movable-view/index.ts index c2ecbb63b..0a429090f 100644 --- a/packages/uni-components/src/components/movable-view/index.ts +++ b/packages/uni-components/src/components/movable-view/index.ts @@ -1,7 +1,7 @@ import { ExtractPropTypes } from 'vue' import { Decline, Friction, STD } from './utils' export { Decline, Friction, STD } -export const props = { +export const movableViewProps = { direction: { type: String, default: 'none', @@ -56,7 +56,7 @@ export const props = { }, } -export type Props = ExtractPropTypes +export type Props = ExtractPropTypes export type FrictionCallback = (friction: Friction | STD) => void export type Record = { id: number diff --git a/packages/uni-components/src/components/movable-area.ts b/packages/uni-components/src/components/movableArea.ts similarity index 51% rename from packages/uni-components/src/components/movable-area.ts rename to packages/uni-components/src/components/movableArea.ts index 9bfc949ce..19e766e96 100644 --- a/packages/uni-components/src/components/movable-area.ts +++ b/packages/uni-components/src/components/movableArea.ts @@ -1,8 +1,8 @@ import { ExtractPropTypes } from 'vue' -export const props = { +export const movableAreaProps = { scaleArea: { type: Boolean, default: false, }, } -export type Props = ExtractPropTypes +export type Props = ExtractPropTypes diff --git a/packages/uni-components/src/components/picker-view.ts b/packages/uni-components/src/components/pickerView.ts similarity index 88% rename from packages/uni-components/src/components/picker-view.ts rename to packages/uni-components/src/components/pickerView.ts index 2a4b7c20d..b3ec99cb6 100644 --- a/packages/uni-components/src/components/picker-view.ts +++ b/packages/uni-components/src/components/pickerView.ts @@ -5,7 +5,7 @@ import { WritableComputedRef, } from 'vue' -export const props = { +export const pickerViewProps = { value: { type: Array as PropType, default() { @@ -36,7 +36,7 @@ export const props = { }, } -export type Props = ExtractPropTypes +export type Props = ExtractPropTypes export type GetPickerViewColumn = ( columnInstance: ComponentInternalInstance diff --git a/packages/uni-components/src/nvue/label/index.tsx b/packages/uni-components/src/nvue/label/index.tsx index 0a96ada09..5a7003b35 100644 --- a/packages/uni-components/src/nvue/label/index.tsx +++ b/packages/uni-components/src/nvue/label/index.tsx @@ -1,6 +1,6 @@ import { defineComponent } from 'vue' import { useCurrentPageId } from '@dcloudio/uni-core' -import { props, useProvideLabel } from '../../components/label' +import { labelProps, useProvideLabel } from '../../components/label' export { UniLabelCtx, uniLabelKey } from '../../components/label' @@ -10,7 +10,7 @@ type LabelTarget = HTMLElement & { export default /*#__PURE__*/ defineComponent({ name: 'Label', - props, + props: labelProps, styles: [], setup(props, { slots }) { const pageId = useCurrentPageId() diff --git a/packages/uni-components/src/nvue/movable-area/index.tsx b/packages/uni-components/src/nvue/movable-area/index.tsx index b041c3a6b..821f7a3a7 100644 --- a/packages/uni-components/src/nvue/movable-area/index.tsx +++ b/packages/uni-components/src/nvue/movable-area/index.tsx @@ -1,5 +1,5 @@ import { defineComponent, Ref, ref, onMounted, provide } from 'vue' -import { props } from '../../components/movable-area' +import { movableAreaProps } from '../../components/movableArea' import { flatVNode } from '../../helpers/flatVNode' import { TouchtrackEvent } from '../movable-view/useTouchtrack' import { getComponentSize } from '../helpers' @@ -28,7 +28,7 @@ export interface parentSize { export default defineComponent({ name: 'MovableArea', - props, + props: movableAreaProps, styles: [ { 'uni-movable-area': { diff --git a/packages/uni-components/src/nvue/movable-view/index.tsx b/packages/uni-components/src/nvue/movable-view/index.tsx index ed10b2e43..cd306fe30 100644 --- a/packages/uni-components/src/nvue/movable-view/index.tsx +++ b/packages/uni-components/src/nvue/movable-view/index.tsx @@ -31,7 +31,7 @@ import { Decline, Friction, STD, - props, + movableViewProps, Props, FrictionCallback, Record, @@ -113,7 +113,7 @@ const animation = weex.requireModule('animation') export default defineComponent({ name: 'MovableView', - props, + props: movableViewProps, emits: ['change', 'scale'], styles: [ { diff --git a/packages/uni-components/src/nvue/picker-view/index.tsx b/packages/uni-components/src/nvue/picker-view/index.tsx index 2613c031c..54e15be73 100644 --- a/packages/uni-components/src/nvue/picker-view/index.tsx +++ b/packages/uni-components/src/nvue/picker-view/index.tsx @@ -10,21 +10,24 @@ import { ExtractPropTypes, } from 'vue' import { extend } from '@vue/shared' -import { props, GetPickerViewColumn } from '../../components/picker-view' +import { + pickerViewProps, + GetPickerViewColumn, +} from '../../components/pickerView' import { flatVNode } from '../../helpers/flatVNode' import { useCustomEvent, EmitEvent } from '../../helpers/useNVueEvent' export { Props, GetPickerViewColumn } -const pickerViewProps = extend({}, props, { +const nvuePickerViewProps = extend({}, pickerViewProps, { height: { type: [Number, String], default: 0, }, }) -type Props = ExtractPropTypes +type Props = ExtractPropTypes export default defineComponent({ name: 'PickerView', - props: pickerViewProps, + props: nvuePickerViewProps, emits: ['change', 'update:value'], setup(props, { slots, emit }) { const rootRef: Ref = ref(null) diff --git a/packages/uni-components/src/vue/label/index.tsx b/packages/uni-components/src/vue/label/index.tsx index 63dddd5a3..6b57f8c16 100644 --- a/packages/uni-components/src/vue/label/index.tsx +++ b/packages/uni-components/src/vue/label/index.tsx @@ -2,13 +2,13 @@ import { computed } from 'vue' import { useCurrentPageId } from '@dcloudio/uni-core' import { withWebEvent } from '../../helpers/useEvent' import { defineBuiltInComponent } from '../../helpers/component' -import { props, useProvideLabel } from '../../components/label' +import { labelProps, useProvideLabel } from '../../components/label' export { UniLabelCtx, uniLabelKey } from '../../components/label' export default /*#__PURE__*/ defineBuiltInComponent({ name: 'Label', - props, + props: labelProps, setup(props, { slots }) { const pageId = useCurrentPageId() const handlers = useProvideLabel() diff --git a/packages/uni-components/src/vue/movable-area/index.tsx b/packages/uni-components/src/vue/movable-area/index.tsx index 5f9246dcf..fa5c5af10 100644 --- a/packages/uni-components/src/vue/movable-area/index.tsx +++ b/packages/uni-components/src/vue/movable-area/index.tsx @@ -6,7 +6,7 @@ import { initScrollBounce, disableScrollBounce } from '../../helpers/scroll' import ResizeSensor from '../resize-sensor/index' import { flatVNode } from '../../helpers/flatVNode' import { useRebuild } from '../../helpers/useRebuild' -import { props, Props } from '../../components/movable-area' +import { movableAreaProps, Props } from '../../components/movableArea' type _TouchEvent = '_onTouchstart' | '_onTouchmove' | '_onTouchend' export interface MovableViewContext { @@ -21,7 +21,7 @@ export type RemoveMovableViewContext = (context: MovableViewContext) => void export default /*#__PURE__*/ defineBuiltInComponent({ inheritAttrs: false, name: 'MovableArea', - props, + props: movableAreaProps, setup(props, { slots }) { const rootRef: Ref = ref(null) const _isMounted = ref(false) diff --git a/packages/uni-components/src/vue/movable-view/index.tsx b/packages/uni-components/src/vue/movable-view/index.tsx index 8acb32acf..5507af33c 100644 --- a/packages/uni-components/src/vue/movable-view/index.tsx +++ b/packages/uni-components/src/vue/movable-view/index.tsx @@ -17,7 +17,7 @@ import { Decline, Friction, STD, - props, + movableViewProps, Props, FrictionCallback, Record, @@ -28,7 +28,7 @@ type RootRef = Ref export default /*#__PURE__*/ defineBuiltInComponent({ name: 'MovableView', - props, + props: movableViewProps, emits: ['change', 'scale'], setup(props, { slots, emit }) { const rootRef: RootRef = ref(null) diff --git a/packages/uni-components/src/vue/picker-view/index.tsx b/packages/uni-components/src/vue/picker-view/index.tsx index 525805b99..b73badab1 100644 --- a/packages/uni-components/src/vue/picker-view/index.tsx +++ b/packages/uni-components/src/vue/picker-view/index.tsx @@ -18,8 +18,8 @@ import { flatVNode } from '../../helpers/flatVNode' import { useRebuild } from '../../helpers/useRebuild' import ResizeSensor from '../resize-sensor/index' import { useCustomEvent } from '../../helpers/useEvent' -import { props } from '../../components/picker-view' -import type { Props, GetPickerViewColumn } from '../../components/picker-view' +import { pickerViewProps } from '../../components/pickerView' +import type { Props, GetPickerViewColumn } from '../../components/pickerView' export { Props, GetPickerViewColumn } export interface State { value: number[] @@ -54,7 +54,7 @@ function useState(props: Props): State { export default /*#__PURE__*/ defineBuiltInComponent({ name: 'PickerView', - props, + props: pickerViewProps, emits: ['change', 'pickstart', 'pickend', 'update:value'], setup(props, { slots, emit }) { const rootRef: Ref = ref(null) diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index 2e0f432c6..25f48f23a 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -729,7 +729,7 @@ function provideForm(trigger) { }); return fields2; } -const props$u = { +const labelProps = { for: { type: String, default: "" @@ -750,7 +750,7 @@ function useProvideLabel() { } var index$D = /* @__PURE__ */ defineBuiltInComponent({ name: "Label", - props: props$u, + props: labelProps, setup(props2, { slots }) { @@ -1626,7 +1626,7 @@ function getTempCanvas(width = 0, height = 0) { tempCanvas.height = height; return tempCanvas; } -const props$t = { +const props$q = { canvasId: { type: String, default: "" @@ -1646,7 +1646,7 @@ var index$B = /* @__PURE__ */ defineBuiltInComponent({ compatConfig: { MODE: 3 }, - props: props$t, + props: props$q, computed: { id() { return this.canvasId; @@ -2104,7 +2104,7 @@ function useMethods(props2, canvasRef, actionsWaiting) { }); } const uniCheckGroupKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniCheckGroup" : "ucg"); -const props$s = { +const props$p = { name: { type: String, default: "" @@ -2112,7 +2112,7 @@ const props$s = { }; var index$A = /* @__PURE__ */ defineBuiltInComponent({ name: "CheckboxGroup", - props: props$s, + props: props$p, emits: ["change"], setup(props2, { emit: emit2, @@ -2164,7 +2164,7 @@ function useProvideCheckGroup(props2, trigger) { } return getFieldsValue; } -const props$r = { +const props$o = { checked: { type: [Boolean, String], default: false @@ -2188,7 +2188,7 @@ const props$r = { }; var index$z = /* @__PURE__ */ defineBuiltInComponent({ name: "Checkbox", - props: props$r, + props: props$o, setup(props2, { slots }) { @@ -2255,7 +2255,7 @@ function useCheckboxInject(checkboxChecked, checkboxValue, reset) { let resetTimer; function iosHideKeyboard() { } -const props$q = { +const props$n = { cursorSpacing: { type: [Number, String], default: 0 @@ -2427,7 +2427,7 @@ function useQuill(props2, rootRef, trigger) { useContextInfo(); useSubscribe(); } -const props$p = /* @__PURE__ */ shared.extend({}, props$q, { +const props$m = /* @__PURE__ */ shared.extend({}, props$n, { id: { type: String, default: "" @@ -2455,7 +2455,7 @@ const props$p = /* @__PURE__ */ shared.extend({}, props$q, { }); var index$y = /* @__PURE__ */ defineBuiltInComponent({ name: "Editor", - props: props$p, + props: props$m, emit: ["ready", "focus", "blur", "input", "statuschange", ...emit$1], setup(props2, { emit: emit2 @@ -2541,7 +2541,7 @@ var index$x = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$o = { +const props$l = { src: { type: String, default: "" @@ -2580,7 +2580,7 @@ const IMAGE_MODES = { }; var index$w = /* @__PURE__ */ defineBuiltInComponent({ name: "Image", - props: props$o, + props: props$l, setup(props2, { emit: emit2 }) { @@ -2829,7 +2829,7 @@ const UniViewJSBridgeSubscribe = function() { function getValueString(value) { return value === null ? "" : String(value); } -const props$n = /* @__PURE__ */ shared.extend({}, { +const props$k = /* @__PURE__ */ shared.extend({}, { name: { type: String, default: "" @@ -2898,7 +2898,7 @@ const props$n = /* @__PURE__ */ shared.extend({}, { type: Boolean, default: false } -}, props$q); +}, props$n); const emit = [ "input", "focus", @@ -3093,7 +3093,7 @@ function useField(props2, rootRef, emit2, beforeInput) { trigger }; } -const props$m = /* @__PURE__ */ shared.extend({}, props$n, { +const props$j = /* @__PURE__ */ shared.extend({}, props$k, { placeholderClass: { type: String, default: "input-placeholder" @@ -3105,7 +3105,7 @@ const props$m = /* @__PURE__ */ shared.extend({}, props$n, { }); var Input = /* @__PURE__ */ defineBuiltInComponent({ name: "Input", - props: props$m, + props: props$j, emits: ["confirm", ...emit], setup(props2, { emit: emit2 @@ -3283,7 +3283,7 @@ function flatVNode(nodes) { } return array; } -const props$l = { +const movableAreaProps = { scaleArea: { type: Boolean, default: false @@ -3292,7 +3292,7 @@ const props$l = { var index$v = /* @__PURE__ */ defineBuiltInComponent({ inheritAttrs: false, name: "MovableArea", - props: props$l, + props: movableAreaProps, setup(props2, { slots }) { @@ -3780,7 +3780,7 @@ STD.prototype.reconfigure = function(e2, t2, n) { this._springY.reconfigure(e2, t2, n); this._springScale.reconfigure(e2, t2, n); }; -const props$k = { +const movableViewProps = { direction: { type: String, default: "none" @@ -3839,7 +3839,7 @@ function v(a, b) { } var index$u = /* @__PURE__ */ defineBuiltInComponent({ name: "MovableView", - props: props$k, + props: movableViewProps, emits: ["change", "scale"], setup(props2, { slots, @@ -4324,7 +4324,7 @@ var index$t = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$j = { +const pickerViewProps = { value: { type: Array, default() { @@ -4371,7 +4371,7 @@ function useState$2(props2) { } var PickerView = /* @__PURE__ */ defineBuiltInComponent({ name: "PickerView", - props: props$j, + props: pickerViewProps, emits: ["change", "pickstart", "pickend", "update:value"], setup(props2, { slots, @@ -4464,7 +4464,7 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({ const getPickerViewColumn = vue.inject("getPickerViewColumn"); const instance = vue.getCurrentInstance(); const currentRef = getPickerViewColumn ? getPickerViewColumn(instance) : vue.ref(0); - const pickerViewProps = vue.inject("pickerViewProps"); + const pickerViewProps2 = vue.inject("pickerViewProps"); const pickerViewState = vue.inject("pickerViewState"); const indicatorHeight = vue.ref(34); const resizeSensorRef = vue.ref(null); @@ -4530,11 +4530,11 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({ "onClick": handleTap, "class": "uni-picker-view-group" }, [vue.createVNode("div", vue.mergeProps(scopedAttrsState.attrs, { - "class": ["uni-picker-view-mask", pickerViewProps.maskClass], - "style": `background-size: 100% ${maskSize.value}px;${pickerViewProps.maskStyle}` + "class": ["uni-picker-view-mask", pickerViewProps2.maskClass], + "style": `background-size: 100% ${maskSize.value}px;${pickerViewProps2.maskStyle}` }), null, 16), vue.createVNode("div", vue.mergeProps(scopedAttrsState.attrs, { - "class": ["uni-picker-view-indicator", pickerViewProps.indicatorClass], - "style": pickerViewProps.indicatorStyle + "class": ["uni-picker-view-indicator", pickerViewProps2.indicatorClass], + "style": pickerViewProps2.indicatorStyle }), [vue.createVNode(ResizeSensor, { "ref": resizeSensorRef, "onResize": ({ @@ -6370,7 +6370,7 @@ var index$j = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$9 = /* @__PURE__ */ shared.extend({}, props$n, { +const props$9 = /* @__PURE__ */ shared.extend({}, props$k, { placeholderClass: { type: String, default: "input-placeholder" diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 9ce5d3351..6bd12c062 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -1769,7 +1769,7 @@ function provideForm(trigger) { }); return fields2; } -const props$B = { +const labelProps = { for: { type: String, default: "" @@ -1790,7 +1790,7 @@ function useProvideLabel() { } var index$z = /* @__PURE__ */ defineBuiltInComponent({ name: "Label", - props: props$B, + props: labelProps, setup(props2, { slots }) { @@ -6419,7 +6419,7 @@ function getTempCanvas(width = 0, height = 0) { tempCanvas.height = height; return tempCanvas; } -const props$A = { +const props$x = { canvasId: { type: String, default: "" @@ -6439,7 +6439,7 @@ var index$w = /* @__PURE__ */ defineBuiltInComponent({ compatConfig: { MODE: 3 }, - props: props$A, + props: props$x, computed: { id() { return this.canvasId; @@ -6900,7 +6900,7 @@ function useMethods(props2, canvasRef, actionsWaiting) { }); } const uniCheckGroupKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniCheckGroup" : "ucg"); -const props$z = { +const props$w = { name: { type: String, default: "" @@ -6908,7 +6908,7 @@ const props$z = { }; var index$v = /* @__PURE__ */ defineBuiltInComponent({ name: "CheckboxGroup", - props: props$z, + props: props$w, emits: ["change"], setup(props2, { emit: emit2, @@ -6960,7 +6960,7 @@ function useProvideCheckGroup(props2, trigger) { } return getFieldsValue; } -const props$y = { +const props$v = { checked: { type: [Boolean, String], default: false @@ -6984,7 +6984,7 @@ const props$y = { }; var index$u = /* @__PURE__ */ defineBuiltInComponent({ name: "Checkbox", - props: props$y, + props: props$v, setup(props2, { slots }) { @@ -7061,7 +7061,7 @@ function useCheckboxInject(checkboxChecked, checkboxValue, reset) { let resetTimer; function iosHideKeyboard() { } -const props$x = { +const props$u = { cursorSpacing: { type: [Number, String], default: 0 @@ -7838,7 +7838,7 @@ function useQuill(props2, rootRef, trigger) { } }, id2, true); } -const props$w = /* @__PURE__ */ extend({}, props$x, { +const props$t = /* @__PURE__ */ extend({}, props$u, { id: { type: String, default: "" @@ -7866,7 +7866,7 @@ const props$w = /* @__PURE__ */ extend({}, props$x, { }); var index$t = /* @__PURE__ */ defineBuiltInComponent({ name: "Editor", - props: props$w, + props: props$t, emit: ["ready", "focus", "blur", "input", "statuschange", ...emit$1], setup(props2, { emit: emit2 @@ -7953,7 +7953,7 @@ var index$s = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$v = { +const props$s = { src: { type: String, default: "" @@ -7992,7 +7992,7 @@ const IMAGE_MODES = { }; var index$r = /* @__PURE__ */ defineBuiltInComponent({ name: "Image", - props: props$v, + props: props$s, setup(props2, { emit: emit2 }) { @@ -8306,7 +8306,7 @@ const UniViewJSBridgeSubscribe = function() { function getValueString(value) { return value === null ? "" : String(value); } -const props$u = /* @__PURE__ */ extend({}, { +const props$r = /* @__PURE__ */ extend({}, { name: { type: String, default: "" @@ -8375,7 +8375,7 @@ const props$u = /* @__PURE__ */ extend({}, { type: Boolean, default: false } -}, props$x); +}, props$u); const emit = [ "input", "focus", @@ -8579,7 +8579,7 @@ function useField(props2, rootRef, emit2, beforeInput) { trigger }; } -const props$t = /* @__PURE__ */ extend({}, props$u, { +const props$q = /* @__PURE__ */ extend({}, props$r, { placeholderClass: { type: String, default: "input-placeholder" @@ -8591,7 +8591,7 @@ const props$t = /* @__PURE__ */ extend({}, props$u, { }); var Input = /* @__PURE__ */ defineBuiltInComponent({ name: "Input", - props: props$t, + props: props$q, emits: ["confirm", ...emit], setup(props2, { emit: emit2 @@ -8769,7 +8769,7 @@ function flatVNode(nodes) { } return array; } -const props$s = { +const movableAreaProps = { scaleArea: { type: Boolean, default: false @@ -8778,7 +8778,7 @@ const props$s = { var MovableArea = /* @__PURE__ */ defineBuiltInComponent({ inheritAttrs: false, name: "MovableArea", - props: props$s, + props: movableAreaProps, setup(props2, { slots }) { @@ -9384,7 +9384,7 @@ STD.prototype.reconfigure = function(e2, t2, n) { this._springY.reconfigure(e2, t2, n); this._springScale.reconfigure(e2, t2, n); }; -const props$r = { +const movableViewProps = { direction: { type: String, default: "none" @@ -9443,7 +9443,7 @@ function v(a2, b) { } var MovableView = /* @__PURE__ */ defineBuiltInComponent({ name: "MovableView", - props: props$r, + props: movableViewProps, emits: ["change", "scale"], setup(props2, { slots, @@ -10139,7 +10139,7 @@ var index$q = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$q = { +const pickerViewProps = { value: { type: Array, default() { @@ -10186,7 +10186,7 @@ function useState$4(props2) { } var PickerView = /* @__PURE__ */ defineBuiltInComponent({ name: "PickerView", - props: props$q, + props: pickerViewProps, emits: ["change", "pickstart", "pickend", "update:value"], setup(props2, { slots, @@ -10993,7 +10993,7 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({ const getPickerViewColumn = inject("getPickerViewColumn"); const instance2 = getCurrentInstance(); const currentRef = getPickerViewColumn ? getPickerViewColumn(instance2) : ref(0); - const pickerViewProps = inject("pickerViewProps"); + const pickerViewProps2 = inject("pickerViewProps"); const pickerViewState = inject("pickerViewState"); const indicatorHeight = ref(34); const resizeSensorRef = ref(null); @@ -11119,11 +11119,11 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({ "onClick": handleTap, "class": "uni-picker-view-group" }, [createVNode("div", mergeProps(scopedAttrsState.attrs, { - "class": ["uni-picker-view-mask", pickerViewProps.maskClass], - "style": `background-size: 100% ${maskSize.value}px;${pickerViewProps.maskStyle}` + "class": ["uni-picker-view-mask", pickerViewProps2.maskClass], + "style": `background-size: 100% ${maskSize.value}px;${pickerViewProps2.maskStyle}` }), null, 16), createVNode("div", mergeProps(scopedAttrsState.attrs, { - "class": ["uni-picker-view-indicator", pickerViewProps.indicatorClass], - "style": pickerViewProps.indicatorStyle + "class": ["uni-picker-view-indicator", pickerViewProps2.indicatorClass], + "style": pickerViewProps2.indicatorStyle }), [createVNode(ResizeSensor, { "ref": resizeSensorRef, "onResize": ({ @@ -13283,7 +13283,7 @@ var index$j = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$g = /* @__PURE__ */ extend({}, props$u, { +const props$g = /* @__PURE__ */ extend({}, props$r, { placeholderClass: { type: String, default: "input-placeholder" -- GitLab