Skip to content

fix: select flash on safari (ARM Platform) #2240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pointhalo wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: select flash on safari (ARM Platform) #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9081cf
fix: fix flickering of select in safari
nekocode Dec 2, 2023
a587507
fix: try not reposition when select init
pointhalo May 15, 2024
b5b8690
Merge branch 'main' into alpha-safari
pointhalo May 15, 2024
37946f4
Merge branch 'main' into alpha-safari
pointhalo May 15, 2024
8937586
v2.59.0-alpha.0
pointhalo May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"useWorkspaces": true,
"npmClient": "yarn",
"version": "2.58.0"
"version": "2.59.0-alpha.0"
}
6 changes: 3 additions & 3 deletions packages/semi-animation-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-animation-react",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "motion library for semi-ui-react",
"keywords": [
"motion",
Expand All @@ -25,8 +25,8 @@
"prepublishOnly": "npm run build:lib"
},
"dependencies": {
"@douyinfe/semi-animation": "2.58.0",
"@douyinfe/semi-animation-styled": "2.58.0",
"@douyinfe/semi-animation": "2.59.0-alpha.0",
"@douyinfe/semi-animation-styled": "2.59.0-alpha.0",
"classnames": "^2.2.6"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-animation-styled/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-animation-styled",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "semi styled animation",
"keywords": [
"semi",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-animation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-animation",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "animation base library for semi-ui",
"keywords": [
"animation",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-eslint-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-semi-design",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "semi ui eslint plugin",
"keywords": [
"semi",
Expand Down
4 changes: 2 additions & 2 deletions packages/semi-foundation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@douyinfe/semi-foundation",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "",
"scripts": {
"build:lib": "node ./scripts/compileLib.js",
"prepublishOnly": "npm run build:lib"
},
"dependencies": {
"@douyinfe/semi-animation": "2.58.0",
"@douyinfe/semi-animation": "2.59.0-alpha.0",
"async-validator": "^3.5.0",
"classnames": "^2.2.6",
"date-fns": "^2.29.3",
Expand Down
8 changes: 5 additions & 3 deletions packages/semi-foundation/select/foundation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
this._setDropdownWidth();
const isDefaultOpen = this.getProp('defaultOpen');
const isOpen = this.getProp('open');
const originalOptions = this._collectOptions();
const originalOptions = this._collectOptions(false);
this._setDefaultSelection(originalOptions);

if (isDefaultOpen || isOpen) {
Expand Down Expand Up @@ -124,11 +124,13 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
}
}

_collectOptions() {
_collectOptions(needReposition = true) {
const originalOptions = this._adapter.getOptionsFromChildren();
this._adapter.updateOptions(originalOptions);
// Reposition the drop-down layer
this._adapter.rePositionDropdown();
if (needReposition) {
this._adapter.rePositionDropdown();
}
return originalOptions;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/semi-icons-lab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-icons-lab",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "semi icons lab",
"keywords": [
"semi",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-icons",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "semi icons",
"keywords": [
"semi",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-illustrations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-illustrations",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "semi illustrations",
"keywords": [
"semi",
Expand Down
4 changes: 2 additions & 2 deletions packages/semi-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-next",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "Plugin that support Semi Design in Next.js",
"author": "伍浩威 <[email protected]>",
"homepage": "",
Expand All @@ -23,7 +23,7 @@
"typescript": "^4"
},
"dependencies": {
"@douyinfe/semi-webpack-plugin": "2.58.0"
"@douyinfe/semi-webpack-plugin": "2.59.0-alpha.0"
},
"gitHead": "eb34a4f25f002bb4cbcfa51f3df93bed868c831a"
}
2 changes: 1 addition & 1 deletion packages/semi-rspack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-rspack-plugin",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "",
"homepage": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-scss-compile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-scss-compile",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "compile semi scss to css",
"author": "[email protected]",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-theme-default/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-theme-default",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "semi-theme-default",
"keywords": [
"semi-theme",
Expand Down
14 changes: 7 additions & 7 deletions packages/semi-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-ui",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "A modern, comprehensive, flexible design system and UI library. Connect DesignOps & DevOps. Quickly build beautiful React apps. Maintained by Douyin-fe team.",
"main": "lib/cjs/index.js",
"module": "lib/es/index.js",
Expand All @@ -20,12 +20,12 @@
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/sortable": "^7.0.2",
"@dnd-kit/utilities": "^3.2.1",
"@douyinfe/semi-animation": "2.58.0",
"@douyinfe/semi-animation-react": "2.58.0",
"@douyinfe/semi-foundation": "2.58.0",
"@douyinfe/semi-icons": "2.58.0",
"@douyinfe/semi-illustrations": "2.58.0",
"@douyinfe/semi-theme-default": "2.58.0",
"@douyinfe/semi-animation": "2.59.0-alpha.0",
"@douyinfe/semi-animation-react": "2.59.0-alpha.0",
"@douyinfe/semi-foundation": "2.59.0-alpha.0",
"@douyinfe/semi-icons": "2.59.0-alpha.0",
"@douyinfe/semi-illustrations": "2.59.0-alpha.0",
"@douyinfe/semi-theme-default": "2.59.0-alpha.0",
"async-validator": "^3.5.0",
"classnames": "^2.2.6",
"copy-text-to-clipboard": "^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-ui/tooltip/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export default class Tooltip extends BaseComponent<TooltipProps, TooltipState> {
{
isInsert: true,
transitionState: 'enter',
containerStyle: { ...this.state.containerStyle, ...containerStyle },
containerStyle: { ...this.state.containerStyle, ...containerStyle }
},
() => {
setTimeout(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/semi-webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@douyinfe/semi-webpack-plugin",
"version": "2.58.0",
"version": "2.59.0-alpha.0",
"description": "",
"author": "伍浩威 <[email protected]>",
"homepage": "",
Expand Down