Skip to content

Commit

Permalink
Merge branch 'main' into polaris-release
Browse files Browse the repository at this point in the history
  • Loading branch information
dleroux committed Apr 5, 2021
2 parents c871507 + c9fe82a commit bb57afb
Show file tree
Hide file tree
Showing 45 changed files with 600 additions and 159 deletions.
13 changes: 13 additions & 0 deletions UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

### Bug fixes

- Added `hideOnPrint` prop to `Card` and `CardSection` ([#4071](https://github.com/Shopify/polaris-react/pull/4071))
- `DropZone` now has plural sentences when `allowMultiple` is true [#4037](https://github.com/Shopify/polaris-react/pull/4037)

### Bug fixes

- Hide `IndexTable` header after scrolling past table body ([#4063](https://github.com/Shopify/polaris-react/issues/4063))
- Update `IndexTable` to select row when clicked ([#4062](https://github.com/Shopify/polaris-react/issues/4062))
- Fixed `Filters` focus state when tabbing into the component from a popover ([#4073](https://github.com/Shopify/polaris-react/issues/4073))
- Removed the `isMounted` check from `Portal` to only rely on the useEffect for calling `onPortalCreated` ([#4066](https://github.com/Shopify/polaris-react/pull/4066))
- Removed transition from `BulkActions` to eliminate flicker ([#4080](https://github.com/Shopify/polaris-react/pulls/4080))
- update error background color in `Select` ([#4089](https://github.com/Shopify/polaris-react/pull/4089))
- Fixed `Trapfocus` issue that was preventing tabbing with react forms ([#4100](https://github.com/Shopify/polaris-react/pull/4100))

### Documentation

### Development workflow
Expand Down
6 changes: 3 additions & 3 deletions examples/next.js/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5661,9 +5661,9 @@ xtend@^4.0.0, xtend@~4.0.1:
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

y18n@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
version "4.0.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==

yallist@^3.0.2:
version "3.1.1"
Expand Down
27 changes: 19 additions & 8 deletions locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Pokračovat v úpravách"
},
"DropZone": {
"overlayTextFile": "Soubor nahrajete přetáhnutím",
"overlayTextImage": "Obrázek nahrajete přetáhnutím",
"errorOverlayTextFile": "Typ souboru není platný",
"errorOverlayTextImage": "Typ obrázku není platný",
"FileUpload": {
"actionTitleFile": "Přidat soubor",
"actionTitleImage": "Přidat obrázek",
"actionHintFile": "nebo nahrajte soubor přetáhnutím",
"actionHintImage": "nebo nahrajte obrázek přetáhnutím",
"label": "Nahrát soubor"
"single": {
"overlayTextFile": "Soubor nahrajete přetažením",
"overlayTextImage": "Obrázek nahrajete přetažením",
"actionTitleFile": "Přidejte soubor",
"actionTitleImage": "Přidejte obrázek",
"actionHintFile": "nebo ho nahrajte přetažením",
"actionHintImage": "nebo ho nahrajte přetažením",
"labelFile": "Nahrát soubor",
"labelImage": "Nahrát obrázek"
},
"allowMultiple": {
"overlayTextFile": "Soubory nahrajete přetažením",
"overlayTextImage": "Obrázky nahrajete přetažením",
"actionTitleFile": "Přidejte soubory",
"actionTitleImage": "Přidejte obrázky",
"actionHintFile": "nebo je nahrajte přetažením",
"actionHintImage": "nebo je nahrajte přetažením",
"labelFile": "Nahrát soubory",
"labelImage": "Nahrát obrázky"
}
},
"EmptySearchResult": {
Expand Down
19 changes: 15 additions & 4 deletions locales/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Fortsæt redigering"
},
"DropZone": {
"overlayTextFile": "Slip fil for at uploade",
"overlayTextImage": "Slip billede for at uploade",
"errorOverlayTextFile": "Filtype er ikke gyldig",
"errorOverlayTextImage": "Billedtype er ikke gyldig",
"FileUpload": {
"single": {
"overlayTextFile": "Slip fil for at uploade",
"overlayTextImage": "Slip billede for at uploade",
"actionTitleFile": "Tilføj fil",
"actionTitleImage": "Tilføj billede",
"actionHintFile": "eller slip filen for at uploade",
"actionHintImage": "eller slip billedet for at uploade",
"labelFile": "Upload fil",
"labelImage": "Upload billede"
},
"allowMultiple": {
"overlayTextFile": "Slip filer for at uploade",
"overlayTextImage": "Slip billeder for at uploade",
"actionTitleFile": "Tilføj filer",
"actionTitleImage": "Tilføj billeder",
"actionHintFile": "eller slip filer for at uploade",
"actionHintImage": "eller slip billeder for at uploade",
"label": "Upload fil"
"labelFile": "Upload filer",
"labelImage": "Upload billeder"
}
},
"EmptySearchResult": {
Expand Down
19 changes: 15 additions & 4 deletions locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Weiter bearbeiten"
},
"DropZone": {
"overlayTextFile": "Datei zum Hochladen ablegen",
"overlayTextImage": "Bild zum Hochladen ablegen",
"errorOverlayTextFile": "Der Dateityp ist nicht gültig",
"errorOverlayTextImage": "Der Bildtyp ist nicht gültig",
"FileUpload": {
"single": {
"overlayTextFile": "Datei zum Hochladen ablegen",
"overlayTextImage": "Bild zum Hochladen ablegen",
"actionTitleFile": "Datei hinzufügen",
"actionTitleImage": "Bild hinzufügen",
"actionHintFile": "oder Datei zum Hochladen ablegen",
"actionHintImage": "oder Bild zum Hochladen ablegen",
"labelFile": "Datei hochladen",
"labelImage": "Bild hochladen"
},
"allowMultiple": {
"overlayTextFile": "Dateien zum Hochladen ablegen",
"overlayTextImage": "Bilder zum Hochladen ablegen",
"actionTitleFile": "Dateien hinzufügen",
"actionTitleImage": "Bilder hinzufügen",
"actionHintFile": "oder Dateien zum Hochladen ablegen",
"actionHintImage": "oder Bilder zum Hochladen ablegen",
"label": "Datei hochladen"
"labelFile": "Dateien hochladen",
"labelImage": "Bilder hochladen"
}
},
"EmptySearchResult": {
Expand Down
25 changes: 18 additions & 7 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,28 @@
"secondaryAction": "Continue editing"
},
"DropZone": {
"overlayTextFile": "Drop file to upload",
"overlayTextImage": "Drop image to upload",
"errorOverlayTextFile": "File type is not valid",
"errorOverlayTextImage": "Image type is not valid",
"FileUpload": {
"single": {
"overlayTextFile": "Drop file to upload",
"overlayTextImage": "Drop image to upload",
"actionTitleFile": "Add file",
"actionTitleImage": "Add image",
"actionHintFile": "or drop file to upload",
"actionHintImage": "or drop image to upload",
"labelFile": "Upload file",
"labelImage": "Upload image"
},
"allowMultiple": {
"overlayTextFile": "Drop files to upload",
"overlayTextImage": "Drop images to upload",
"actionTitleFile": "Add files",
"actionTitleImage": "Add images",
"actionHintFile": "or drop files to upload",
"actionHintImage": "or drop images to upload",
"label": "Upload file"
}
"labelFile": "Upload files",
"labelImage": "Upload images"
},
"errorOverlayTextFile": "File type is not valid",
"errorOverlayTextImage": "Image type is not valid"
},
"EmptySearchResult": {
"altText": "Empty search results"
Expand Down
19 changes: 15 additions & 4 deletions locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Continuar editando"
},
"DropZone": {
"overlayTextFile": "Arrastra y suelta el archivo que deseas subir",
"overlayTextImage": "Arrastra y suelta la imagen que deseas subir",
"errorOverlayTextFile": "El tipo de archivo no es válido",
"errorOverlayTextImage": "El tipo de imagen no es válida",
"FileUpload": {
"single": {
"overlayTextFile": "Arrastra y suelta el archivo que deseas subir",
"overlayTextImage": "Arrastra y suelta la imagen que deseas subir",
"actionTitleFile": "Agregar archivo",
"actionTitleImage": "Agregar imagen",
"actionHintFile": "o suelta el archivo que deseas subir",
"actionHintImage": "o arrastra y suelta la imagen que deseas subir",
"labelFile": "Subir archivo",
"labelImage": "Subir imagen"
},
"allowMultiple": {
"overlayTextFile": "Arrastra y suelta los archivos que deseas subir",
"overlayTextImage": "Arrastra y suelta las imágenes que deseas subir",
"actionTitleFile": "Agregar archivos",
"actionTitleImage": "Agregar imágenes",
"actionHintFile": "o arrastra y suelta los archivos que deseas subir",
"actionHintImage": "o arrastra y suelta las imágenes que deseas subir",
"label": "Subir archivo"
"labelFile": "Subir archivos",
"labelImage": "Subir imágenes"
}
},
"EmptySearchResult": {
Expand Down
23 changes: 17 additions & 6 deletions locales/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Jatka muokkausta"
},
"DropZone": {
"overlayTextFile": "Pudota ladattava tiedosto",
"overlayTextImage": "Pudota lähetettävä kuva",
"errorOverlayTextFile": "Tiedostotyyppi ei kelpaa",
"errorOverlayTextImage": "Kuvan tyyppi ei kelpaa",
"FileUpload": {
"single": {
"overlayTextFile": "Pudota tiedosto ladattavaksi",
"overlayTextImage": "Pudota kuva ladattavaksi",
"actionTitleFile": "Lisää tiedosto",
"actionTitleImage": "Lisää kuva",
"actionHintFile": "tai pudota lähetettävät tiedostot",
"actionHintImage": "tai pudota lähetettävät kuvat",
"label": "Lataa tiedosto"
"actionHintFile": "tai pudota tiedosto ladattavaksi",
"actionHintImage": "tai pudota kuva ladattavaksi",
"labelFile": "Lataa tiedosto",
"labelImage": "Lataa kuva"
},
"allowMultiple": {
"overlayTextFile": "Pudota ladattavat tiedostot",
"overlayTextImage": "Pudota ladattavat kuvat",
"actionTitleFile": "Lisää tiedostoja",
"actionTitleImage": "Lisää kuvia",
"actionHintFile": "tai pudota ladattavat tiedostot",
"actionHintImage": "tai pudota ladattavat kuvat",
"labelFile": "Lataa tiedostoja",
"labelImage": "Lataa kuvia"
}
},
"EmptySearchResult": {
Expand Down
23 changes: 17 additions & 6 deletions locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Poursuivre les corrections"
},
"DropZone": {
"overlayTextFile": "Déposer le fichier à mettre en ligne",
"overlayTextImage": "Déposer l'image à mettre en ligne",
"errorOverlayTextFile": "Le type de fichier n'est pas valide",
"errorOverlayTextImage": "Le type d'image n'est pas valide",
"FileUpload": {
"single": {
"overlayTextFile": "Déposer le fichier à mettre en ligne",
"overlayTextImage": "Déposer l'image à mettre en ligne",
"actionTitleFile": "Ajouter un fichier",
"actionTitleImage": "Ajouter une image",
"actionHintFile": "ou déposer les fichiers à mettre en ligne",
"actionHintImage": "ou déposer les images à mettre en ligne",
"label": "Télécharger un fichier"
"actionHintFile": "ou déposer le fichier à mettre en ligne",
"actionHintImage": "ou déposer l'image à mettre en ligne",
"labelFile": "Mettre en ligne un fichier",
"labelImage": "Mettre en ligne une image"
},
"allowMultiple": {
"overlayTextFile": "Déposer les fichiers à mettre en ligne",
"overlayTextImage": "Déposer les images à mettre en ligne",
"actionTitleFile": "Ajouter des fichiers",
"actionTitleImage": "Ajouter des images",
"actionHintFile": "ou déposer des fichiers à mettre en ligne",
"actionHintImage": "ou déposer des images à mettre en ligne",
"labelFile": "Mettre en ligne des fichiers",
"labelImage": "Mettre en ligne des images"
}
},
"EmptySearchResult": {
Expand Down
19 changes: 15 additions & 4 deletions locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "Continua a modificare"
},
"DropZone": {
"overlayTextFile": "Rilascia il file per caricarlo",
"overlayTextImage": "Rilascia l'immagine per caricarla",
"errorOverlayTextFile": "Il tipo di file non è valido",
"errorOverlayTextImage": "Il tipo di immagine non è valido",
"FileUpload": {
"single": {
"overlayTextFile": "Rilascia il file per caricarlo",
"overlayTextImage": "Rilascia l'immagine per caricarla",
"actionTitleFile": "Aggiungi file",
"actionTitleImage": "Aggiungi immagine",
"actionHintFile": "o rilascia il file per caricarlo",
"actionHintImage": "o rilascia l'immagine per caricarla",
"labelFile": "Carica file",
"labelImage": "Carica immagine"
},
"allowMultiple": {
"overlayTextFile": "Rilascia i file per caricarli",
"overlayTextImage": "Rilascia le immagini per caricarle",
"actionTitleFile": "Aggiungi file",
"actionTitleImage": "Aggiungi immagini",
"actionHintFile": "o rilascia i file per caricarli",
"actionHintImage": "o rilascia le immagini per caricarle",
"label": "Carica file"
"labelFile": "Carica file",
"labelImage": "Carica delle immagini"
}
},
"EmptySearchResult": {
Expand Down
25 changes: 18 additions & 7 deletions locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "編集を続ける"
},
"DropZone": {
"overlayTextFile": "ファイルをドロップしてアップロード",
"overlayTextImage": "画像をドロップしてアップロードする",
"errorOverlayTextFile": "ファイルタイプが有効ではありません",
"errorOverlayTextImage": "画像タイプが有効ではありません",
"FileUpload": {
"actionTitleFile": "ファイルを追加する",
"actionTitleImage": "画像を追加する",
"single": {
"overlayTextFile": "ファイルをドロップしてアップロード",
"overlayTextImage": "画像をドロップしてアップロード",
"actionTitleFile": "ファイルを追加",
"actionTitleImage": "画像を追加",
"actionHintFile": "またはファイルをドロップしてアップロード",
"actionHintImage": "または、画像をドロップしてアップロード",
"labelFile": "ファイルをアップロード",
"labelImage": "画像をアップロード"
},
"allowMultiple": {
"overlayTextFile": "ファイルをドロップしてアップロード",
"overlayTextImage": "画像をドロップしてアップロード",
"actionTitleFile": "ファイルを追加",
"actionTitleImage": "画像を追加",
"actionHintFile": "または、ファイルをドロップしてアップロード",
"actionHintImage": "または、画像をドロップしてアップロードする",
"label": "ファイルをアップロード"
"actionHintImage": "または、画像をドロップしてアップロード",
"labelFile": "ファイルをアップロード",
"labelImage": "画像をアップロード"
}
},
"EmptySearchResult": {
Expand Down
19 changes: 15 additions & 4 deletions locales/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,27 @@
"secondaryAction": "계속 편집"
},
"DropZone": {
"overlayTextFile": "업로드할 파일 놓기",
"overlayTextImage": "업로드할 이미지 놓기",
"errorOverlayTextFile": "파일 형식이 유효하지 않습니다.",
"errorOverlayTextImage": "이미지 형식이 유효하지 않습니다.",
"FileUpload": {
"single": {
"overlayTextFile": "업로드할 파일 놓기",
"overlayTextImage": "업로드할 이미지 놓기",
"actionTitleFile": "파일 추가",
"actionTitleImage": "이미지 추가",
"actionHintFile": "또는 업로드할 파일 놓기",
"actionHintImage": "또는 업로드할 이미지 놓기",
"label": "파일 업로드"
"labelFile": "파일 업로드",
"labelImage": "이미지 업로드"
},
"allowMultiple": {
"overlayTextFile": "업로드할 파일 놓기",
"overlayTextImage": "업로드할 이미지 놓기",
"actionTitleFile": "파일 추가",
"actionTitleImage": "이미지 추가",
"actionHintFile": "또는 업로드할 파일 놓기",
"actionHintImage": "또는 업로드할 이미지 놓기",
"labelFile": "파일 업로드",
"labelImage": "이미지 업로드"
}
},
"EmptySearchResult": {
Expand Down
Loading

0 comments on commit bb57afb

Please sign in to comment.