Skip to content

Commit

Permalink
feat: 1.Image组件兼容mode=""和src无值的情况；
Browse files Browse the repository at this point in the history 
2.新增openLocation的实现；
3.路由错误抛出原始异常，便于定位；
4.修复Page.onReSize回调参数缺少的字段；
5.为navigateback添加数量上限限制；
6.修复redirectTo跳转不存在页面依然反馈成功的问题；
7.修复tab页面导航栏颜色配置无效的问题；
8.修复从有导航栏跳到无导航栏颜色配置无效的问题；
9.修改页面onShow和onReady生命周期出发顺序；
10.修复windows和mac路径差异问题；
11.优化Animation动画行为和微信小程序一致；
12.优化界面交互api的测试用例；
13.添加uuis出入框，修复tabbar显示长文本问题；
14.修改IntersectionObserver的监听反馈时间为timestamp值；
15.修复NodesRef.fields针对Canvas；
  • Loading branch information
@tangcq-code
tangcq-code committed Dec 11, 2023
1 parent f7dbda8 commit 27ab857
Show file tree
Hide file tree
Showing 32 changed files with 468 additions and 202 deletions.
6 changes: 1 addition & 5 deletions packages/taro-components/__tests__/__snapshots__/image.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Image events 1`] = `
<taro-image-core src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAFA3PEY8MlBGQUZaVVBfeMiCeG5uePWvuZHI////////////////////////////////////////////////////2wBDAVVaWnhpeOuCguv/////////////////////////////////////////////////////////////////////////wAARCAEsAZADASIAAhEBAxEB/8QAGQAAAwEBAQAAAAAAAAAAAAAAAAECAwQF/8QALhABAQACAgICAQMDAgcBAAAAAAECEQMhEjFBUWEEEyIyQnEjoRQzUmKBkbHB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFhEBAQEAAAAAAAAAAAAAAAAAAAER/9oADAMBAAIRAxEAPwDcyMCIyAqirqKgyyY5tsmOYIACgE9kc9g2wb4scG2KDSGUMUJqk0EZMc22THMRJAKAAgMAAAQAHCOSgDIwBkAMgAAAAAAAAAAAAAAAAAAAB3GQAFTJAqiqqKDPJjk2yY5AgjJQHPZHPYN8G2LHBtig0hlFzHYJKtZJEck+QY5Mcm2THIEABQgAAAF9gBIvHC5Oni4Jj3l7Blx8G52rLGepHRl60nHH5Bx5Y2E35cZtl4gkz8S0AAAEAAAAAAAAAAAAAAAAAAdwI0UFQVEKoq6igzyY5NsmOQIACgE9g57Btg3xYYOnDPjwm7lLQaY467qtsZz4W621w7mwOlZuAIOfOaY5Orlx3NubIEEej0oktK1bVTjv0CJN1vjw2ji4759zp1YwEcfFMY00ZUCvdF6hyCwGFlyyvRzibag0DC4zXpllO3XcZUZccoOSwm2fFWeWFgJIwBAAAAAAAAAxYAh6EjXHHoGWiaWI12DrBBFMqCoFU06mgjJlk1yZZCII1TH5y6UTJb6i5JPfsbvqdHIuA7vyetejJRXHh55yR29SanqM+Dj8Md33WjNAAECs3NOfPDV3p0lQcnhL6P8Abt1p0ftzy2uYgwx4tWba3HU6XoKJxx72sjADQMARgCAAAjAJsZ54StSs2DjynaNOrPCac+U7BIAAgYACQKnYDXR6XJ0cgJxxaSHjirWoDHOdiYqs3T0iqBAAVBUBU06mgnJnZtpU+liFJJPyV7vZyb9n0oUh/wCS2Vqh7bfp+Pyy8svUZ8XHeTOT4+Xb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">
<img class="taro-img__mode-scaletofill" src="">
</taro-image-core>
`;
exports[`Image events 1`] = `<taro-image-core src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAFA3PEY8MlBGQUZaVVBfeMiCeG5uePWvuZHI////////////////////////////////////////////////////2wBDAVVaWnhpeOuCguv/////////////////////////////////////////////////////////////////////////wAARCAEsAZADASIAAhEBAxEB/8QAGQAAAwEBAQAAAAAAAAAAAAAAAAECAwQF/8QALhABAQACAgICAQMDAgcBAAAAAAECEQMhEjFBUWEEEyIyQnEjoRQzUmKBkbHB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFhEBAQEAAAAAAAAAAAAAAAAAAAER/9oADAMBAAIRAxEAPwDcyMCIyAqirqKgyyY5tsmOYIACgE9kc9g2wb4scG2KDSGUMUJqk0EZMc22THMRJAKAAgMAAAQAHCOSgDIwBkAMgAAAAAAAAAAAAAAAAAAAB3GQAFTJAqiqqKDPJjk2yY5AgjJQHPZHPYN8G2LHBtig0hlFzHYJKtZJEck+QY5Mcm2THIEABQgAAAF9gBIvHC5Oni4Jj3l7Blx8G52rLGepHRl60nHH5Bx5Y2E35cZtl4gkz8S0AAAEAAAAAAAAAAAAAAAAAAdwI0UFQVEKoq6igzyY5NsmOQIACgE9g57Btg3xYYOnDPjwm7lLQaY467qtsZz4W621w7mwOlZuAIOfOaY5Orlx3NubIEEej0oktK1bVTjv0CJN1vjw2ji4759zp1YwEcfFMY00ZUCvdF6hyCwGFlyyvRzibag0DC4zXpllO3XcZUZccoOSwm2fFWeWFgJIwBAAAAAAAAAxYAh6EjXHHoGWiaWI12DrBBFMqCoFU06mgjJlk1yZZCII1TH5y6UTJb6i5JPfsbvqdHIuA7vyetejJRXHh55yR29SanqM+Dj8Md33WjNAAECs3NOfPDV3p0lQcnhL6P8Abt1p0ftzy2uYgwx4tWba3HU6XoKJxx72sjADQMARgCAAAjAJsZ54StSs2DjynaNOrPCac+U7BIAAgYACQKnYDXR6XJ0cgJxxaSHjirWoDHOdiYqs3T0iqBAAVBUBU06mgnJnZtpU+liFJJPyV7vZyb9n0oUh/wCS2Vqh7bfp+Pyy8svUZ8XHeTOT4+Xb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"></taro-image-core>`;

exports[`Image should preload images 1`] = `
<taro-image-core>
Expand Down
2 changes: 1 addition & 1 deletion packages/taro-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dev:library-react": "cross-env NODE_ENV=development pnpm --filter @tarojs/components-library-react run dev",
"dev:library-vue2": "cross-env NODE_ENV=development pnpm --filter @tarojs/components-library-vue2 run dev",
"dev:library-vue3": "cross-env NODE_ENV=development pnpm --filter @tarojs/components-library-vue3 run dev",
"generate:lib": "mkdir -p lib",
"generate:lib": "node -e \"require('fs').mkdirSync('lib', { recursive: true })\"",
"generate:stencil-config": "esbuild ./scripts/stencil/stencil.config.ts --bundle --platform=node --outfile=stencil.config.js",
"sync:types": "pnpm run tsx --files scripts/json-schema-to-types.ts",
"test": "cross-env NODE_ENV=test stencil test --spec --e2e",
Expand Down
28 changes: 17 additions & 11 deletions packages/taro-components/src/components/image/image.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,26 +90,32 @@ export class Image implements ComponentInterface {
didLoad
} = this

// mode="" 按默认值处理
const compMode = mode || 'scaleToFill'

const cls = classNames({
'taro-img__widthfix': mode === 'widthFix'
'taro-img__widthfix': compMode === 'widthFix'
})
const imgCls = classNames(
`taro-img__mode-${mode.toLowerCase().replace(/\s/g, '')}`,
`taro-img__mode-${compMode.toLowerCase().replace(/\s/g, '')}`,
{
[`taro-img__mode-aspectfill--${aspectFillMode}`]: mode === 'aspectFill'
[`taro-img__mode-aspectfill--${aspectFillMode}`]: compMode === 'aspectFill'
}
)

return (
<Host class={cls}>
<img
ref={(img) => (this.imgRef = img!)}
class={imgCls}
src={lazyLoad && !didLoad ? undefined : src}
onLoad={imageOnLoad.bind(this)}
onError={imageOnError.bind(this)}
{...nativeProps}
/>
{
src ? (
<img
ref={(img) => (this.imgRef = img!)}
class={imgCls}
src={lazyLoad && !didLoad ? undefined : src}
onLoad={imageOnLoad.bind(this)}
onError={imageOnError.bind(this)}
{...nativeProps} />
) : ''
}
</Host>
)
}
Expand Down
7 changes: 4 additions & 3 deletions packages/taro-h5/__tests__/base/index.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ describe('others', () => {
test('should covert base64 to arraybuffer', () => {
const base64 = 'CxYh'
const arrayBuffer = Taro.base64ToArrayBuffer(base64)
expect(arrayBuffer[0]).toBe(11)
expect(arrayBuffer[1]).toBe(22)
expect(arrayBuffer[2]).toBe(33)
const initBuffer = new Uint8Array(arrayBuffer)
expect(initBuffer[0]).toBe(11)
expect(initBuffer[1]).toBe(22)
expect(initBuffer[2]).toBe(33)
})
})
12 changes: 6 additions & 6 deletions packages/taro-h5/__tests__/ui/animation.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ describe('createAnimation', () => {
const ani: any = Taro.createAnimation()
const { rules, transform } = ani
ani.left(10)
expect(rules[0]).toEqual('left: 10px')
expect(rules[0]).toEqual({ 'key': 'left', 'rule': 'left: 10px' })
ani.top('10')
expect(rules[1]).toEqual('top: 10px')
expect(rules[1]).toEqual({ 'key': 'top', 'rule': 'top: 10px' })
ani.right('10%')
expect(rules[2]).toEqual('right: 10%')
expect(rules[2]).toEqual({ 'key': 'right', 'rule': 'right: 10%' })
ani.translate(10, '10%')
expect(transform[1]).toEqual('translate(10px, 10%)')
expect(transform[0]).toEqual({ 'key': 'translate', 'transform': 'translate(10px, 10%)' })
ani.translateX('10')
expect(transform[2]).toEqual('translateX(10px)')
expect(transform[1]).toEqual({ 'key': 'translateX', 'transform': 'translateX(10px)' })
ani.translate3d('10', 10, '20%')
expect(transform[3]).toEqual('translate3d(10px, 10px, 20%)')
expect(transform[2]).toEqual({ 'key': 'translate3d', 'transform': 'translate3d(10px, 10px, 20%)' })
})
})
39 changes: 18 additions & 21 deletions packages/taro-h5/__tests__/ui/interaction/actionSheet.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('actionSheet', () => {
complete
})
.then(res => {
const expectObj = { errMsg: 'showActionSheet:ok', tapIndex: 1 }
const expectObj = { errMsg: 'showActionSheet:ok', tapIndex: 0 }
expect(success).toHaveBeenCalledWith(expectObj)
expect(fail.mock.calls.length).toBe(0)
expect(complete).toHaveBeenCalledWith(expectObj)
Expand All @@ -117,10 +117,10 @@ describe('actionSheet', () => {
const mask = actionSheet.firstChild
const list = actionSheet.lastChild.firstChild

expect(list.childNodes.length).toBe(3)
expect(list.childNodes[0]).toHaveTextContent(itemA)
expect(list.childNodes[1]).toHaveTextContent(itemB)
expect(list.childNodes[2]).toHaveTextContent(itemC)
expect(list.childNodes.length).toBe(4)
expect(list.childNodes[1]).toHaveTextContent(itemA)
expect(list.childNodes[2]).toHaveTextContent(itemB)
expect(list.childNodes[3]).toHaveTextContent(itemC)

setTimeout(() => {
expect(actionSheet).toBeVisible()
Expand Down Expand Up @@ -197,14 +197,13 @@ describe('actionSheet', () => {
Taro.showActionSheet({
itemList: [itemA, itemB, itemC]
})

const actionSheet: any = document.body.lastChild
const list = actionSheet.lastChild.firstChild

expect(list.childNodes.length).toBe(3)
expect(list.childNodes[0]).toHaveTextContent(itemA)
expect(list.childNodes[1]).toHaveTextContent(itemB)
expect(list.childNodes[2]).toHaveTextContent(itemC)
expect(list.childNodes.length).toBe(4)
expect(list.childNodes[1]).toHaveTextContent(itemA)
expect(list.childNodes[2]).toHaveTextContent(itemB)
expect(list.childNodes[3]).toHaveTextContent(itemC)
})

test('should update list item when itemList get longer', () => {
Expand All @@ -216,16 +215,15 @@ describe('actionSheet', () => {
Taro.showActionSheet({
itemList: [itemA, itemB, itemC, itemD, itemE]
})

const actionSheet: any = document.body.lastChild
const list = actionSheet.lastChild.firstChild

expect(list.childNodes.length).toBe(5)
expect(list.childNodes[0]).toHaveTextContent(itemA)
expect(list.childNodes[1]).toHaveTextContent(itemB)
expect(list.childNodes[2]).toHaveTextContent(itemC)
expect(list.childNodes[3]).toHaveTextContent(itemD)
expect(list.childNodes[4]).toHaveTextContent(itemE)
expect(list.childNodes.length).toBe(6)
expect(list.childNodes[1]).toHaveTextContent(itemA)
expect(list.childNodes[2]).toHaveTextContent(itemB)
expect(list.childNodes[3]).toHaveTextContent(itemC)
expect(list.childNodes[4]).toHaveTextContent(itemD)
expect(list.childNodes[5]).toHaveTextContent(itemE)
})

test('should update list item when only itemList get shorter', () => {
Expand All @@ -234,12 +232,11 @@ describe('actionSheet', () => {
Taro.showActionSheet({
itemList: [itemA, itemB]
})

const actionSheet: any = document.body.lastChild
const list = actionSheet.lastChild.firstChild

expect(list.childNodes.length).toBe(2)
expect(list.childNodes[0]).toHaveTextContent(itemA)
expect(list.childNodes[1]).toHaveTextContent(itemB)
expect(list.childNodes.length).toBe(3)
expect(list.childNodes[1]).toHaveTextContent(itemA)
expect(list.childNodes[2]).toHaveTextContent(itemB)
})
})
2 changes: 1 addition & 1 deletion packages/taro-h5/__tests__/ui/tab-bar.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe('tabbar', () => {

it('should be able to switchTab', done => {
Taro.switchTab({
url: '/pages/about/about'
url: '/pages/about/index'
}).then((res: any) => {
expect(res.errMsg).toBe('switchTab:ok')
done()
Expand Down
2 changes: 1 addition & 1 deletion packages/taro-h5/src/api/base/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function arrayBufferToBase64 (arrayBuffer: ArrayBuffer) {
}

export function base64ToArrayBuffer (base64: string) {
return toByteArray(base64)
return toByteArray(base64).buffer
}

export * from './crypto'
Expand Down
8 changes: 6 additions & 2 deletions packages/taro-h5/src/api/device/clipboard.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { isFunction } from '@tarojs/shared'

import { MethodHandler } from '../../utils/handler'
import { getStorageSync, setStorage, setStorageSync } from '../storage/index'
import { showToast } from '../ui/interaction'

const CLIPBOARD_STORAGE_NAME = 'taro_clipboard'

document.addEventListener('copy', () => {
setStorage({
key: CLIPBOARD_STORAGE_NAME,
Expand All @@ -21,7 +21,6 @@ document.addEventListener('copy', () => {
console.error(e)
})
})

/**
* 设置系统剪贴板的内容
*/
Expand Down Expand Up @@ -49,6 +48,11 @@ export const setClipboardData: typeof Taro.setClipboardData = async ({ data, suc
} else {
throw new Error('Unsupported Function: \'document.execCommand\'.')
}
showToast({
title: '内容已复制',
icon: 'none',
duration: 1500
})
return handle.success()
} catch (e) {
return handle.fail({ errMsg: e.message })
Expand Down
10 changes: 7 additions & 3 deletions packages/taro-h5/src/api/device/network.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export const getNetworkType: typeof Taro.getNetworkType = (options = {}) => {
}

const networkStatusManager = new CallbackManager()

const networkStatusListener = async () => {
const { networkType } = await getNetworkType()
const isConnected = networkType !== 'none'
Expand All @@ -79,8 +78,13 @@ export const onNetworkStatusChange: typeof Taro.onNetworkStatusChange = callback

export const offNetworkWeakChange = /* @__PURE__ */ temporarilyNotSupport('offNetworkWeakChange')

export const offNetworkStatusChange: typeof Taro.offNetworkStatusChange = callback => {
networkStatusManager.remove(callback)
export const offNetworkStatusChange: typeof Taro.offNetworkStatusChange = (callback) => {
// 取消监听网络状态变化事件，参数为空，则取消所有的事件监听。
if (callback) {
networkStatusManager.remove(callback)
} else {
networkStatusManager.removeAll()
}
const connection = getConnection()
if (connection && networkStatusManager.count() === 0) {
connection.removeEventListener('change', networkStatusListener)
Expand Down
Loading

0 comments on commit 27ab857

Please sign in to comment.