diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index a8e5fd4c4d..b4c2c57fbf 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -451,12 +451,12 @@ importers: '@rush-temp/model-mail': specifier: file:./projects/model-mail.tgz version: file:projects/model-mail.tgz - '@rush-temp/model-notification': - specifier: file:./projects/model-notification.tgz - version: file:projects/model-notification.tgz '@rush-temp/model-my-space': specifier: file:./projects/model-my-space.tgz version: file:projects/model-my-space.tgz + '@rush-temp/model-notification': + specifier: file:./projects/model-notification.tgz + version: file:projects/model-notification.tgz '@rush-temp/model-preference': specifier: file:./projects/model-preference.tgz version: file:projects/model-preference.tgz @@ -625,6 +625,15 @@ importers: '@rush-temp/mongo': specifier: file:./projects/mongo.tgz version: file:projects/mongo.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + '@rush-temp/my-space': + specifier: file:./projects/my-space.tgz + version: file:projects/my-space.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + '@rush-temp/my-space-assets': + specifier: file:./projects/my-space-assets.tgz + version: file:projects/my-space-assets.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + '@rush-temp/my-space-resources': + specifier: file:./projects/my-space-resources.tgz + version: file:projects/my-space-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) '@rush-temp/notification': specifier: file:./projects/notification.tgz version: file:projects/notification.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) @@ -649,15 +658,6 @@ importers: '@rush-temp/panel': specifier: file:./projects/panel.tgz version: file:projects/panel.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - '@rush-temp/my-space': - specifier: file:./projects/my-space.tgz - version: file:projects/my-space.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - '@rush-temp/my-space-assets': - specifier: file:./projects/my-space-assets.tgz - version: file:projects/my-space-assets.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - '@rush-temp/my-space-resources': - specifier: file:./projects/my-space-resources.tgz - version: file:projects/my-space-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) '@rush-temp/platform': specifier: file:./projects/platform.tgz version: file:projects/platform.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) @@ -1621,9 +1621,9 @@ importers: email-addresses: specifier: ^5.0.0 version: 5.0.0 - emoji-regex: - specifier: ^10.1.0 - version: 10.3.0 + emojibase: + specifier: ^16.0.0 + version: 16.0.0 esbuild: specifier: ^0.24.2 version: 0.24.2 @@ -4163,7 +4163,7 @@ packages: version: 0.0.0 '@rush-temp/desktop@file:projects/desktop.tgz': - resolution: {integrity: sha512-8we0EU2OgAaGXO+0DTj+BXro2vDokwXNGpKcVrzj9BbIvn6+3+BoRJJ1QcWwFa36XKnGuIKkkWMgMRdB6Quv9A==, tarball: file:projects/desktop.tgz} + resolution: {integrity: sha512-YKF8wyv3wcfxqTNHRQncoFfZt3HiJdnUYv7ZA35uqIAdY7Ib3qEhHH8JMBehGeBwMnXX576RBpeZAU0OYxS8ng==, tarball: file:projects/desktop.tgz} version: 0.0.0 '@rush-temp/devmodel-resources@file:projects/devmodel-resources.tgz': @@ -4343,15 +4343,15 @@ packages: version: 0.0.0 '@rush-temp/mail-assets@file:projects/mail-assets.tgz': - resolution: {integrity: sha512-Lp1APt1DRMNrH2DhlOTTJjjIPhThHuc1+3Jj1fJU1ryH4FcJwCDFRw9InLEhjphf9cGC6z06EpgL3+3FtHOmJg==, tarball: file:projects/mail-assets.tgz} + resolution: {integrity: sha512-EY+m2n2E2Sm4zD0/n7psqlOwOH/zSinZE0zDfPLKZCFMF++7wuZ7cpkEz9NbL5zELQwqA7sk/G/IwUVIEXB/Kg==, tarball: file:projects/mail-assets.tgz} version: 0.0.0 '@rush-temp/mail-resources@file:projects/mail-resources.tgz': - resolution: {integrity: sha512-8PtetoobhgQAiaGjqRf2aOgVY3Xh0KkyWTVLA2GIKaWY0lD0Vt69jDk1jptyXJOfkQLXRTSk7JxTs9lH96q8UQ==, tarball: file:projects/mail-resources.tgz} + resolution: {integrity: sha512-MArPZYwi2jollp/LHmrsx6wqyZzX/2XwjptpOg/10kADjpwo6wShL95ABMx5sCZo3+8paGXU1PipjnikbpNc0w==, tarball: file:projects/mail-resources.tgz} version: 0.0.0 '@rush-temp/mail@file:projects/mail.tgz': - resolution: {integrity: sha512-khCqnHqt/MDtJv8eTx08ov9GkvC00wPeb1Q+QE5zk7xqbjK/QYJWPmdMRkvOJobCHLh2/g6ST2lgNbV938hrJA==, tarball: file:projects/mail.tgz} + resolution: {integrity: sha512-0UzQEN733mDUZKfsGvNq8ikfsbVjQgTFOzP7/+buwIfWgeZBqVCoCDJrk90ZQ38yp8dMgdWZ+OymfTZ4WNlb7g==, tarball: file:projects/mail.tgz} version: 0.0.0 '@rush-temp/middleware@file:projects/middleware.tgz': @@ -4371,7 +4371,7 @@ packages: version: 0.0.0 '@rush-temp/model-all@file:projects/model-all.tgz': - resolution: {integrity: sha512-aDRtqYlITENsW02SJbs+KjoynFL+/QYQmYQVN6++EqsnAT+jHGPl/UpnmSr3ZMcALGcwTx61LKQ1nnxNen8tyA==, tarball: file:projects/model-all.tgz} + resolution: {integrity: sha512-Bo2UPIQp6MhS9V5sv9yJDdjxcjTy7u+2+QoGnGBweuD35Mwzy3MQIKnmf6XRLbvHTSkHno6ZKBMiZfWQReLgIw==, tarball: file:projects/model-all.tgz} version: 0.0.0 '@rush-temp/model-analytics-collector@file:projects/model-analytics-collector.tgz': @@ -4455,17 +4455,17 @@ packages: version: 0.0.0 '@rush-temp/model-mail@file:projects/model-mail.tgz': - resolution: {integrity: sha512-Z2WZ+9IF0119TDZDyODrcI3ptuQLQ/h7WaxvbPIFsUQm+MI5VPV6hCNUBNp8if2XQLmSn0YByejtW1bSBz/WAg==, tarball: file:projects/model-mail.tgz} + resolution: {integrity: sha512-/GxdWziahn6TAFJ4/9V7YPatdGo68lWecWkOyMVdBtPFl9VcPsxYKt3cqWz9qk2G6UxV2k2bmI0qt8kg1anxUA==, tarball: file:projects/model-mail.tgz} + version: 0.0.0 + + '@rush-temp/model-my-space@file:projects/model-my-space.tgz': + resolution: {integrity: sha512-P/i9hwPmwSS8ol035oGdkhn66S+D3Knpj2/p65n0wB5oKaFG0Y9sM9NLGUIUAtiDmwGMfFhm2dq0OksEOxZ0BQ==, tarball: file:projects/model-my-space.tgz} version: 0.0.0 '@rush-temp/model-notification@file:projects/model-notification.tgz': resolution: {integrity: sha512-k7valecajKQwOhAeROASPm+RO2/D3xZSkan8Z09kmy+9dNLYBxQT/mr7k+HBdlzU4JD3fDQRP6EStyJBkLFZsQ==, tarball: file:projects/model-notification.tgz} version: 0.0.0 - '@rush-temp/model-my-space@file:projects/model-my-space.tgz': - resolution: {integrity: sha512-OxBDKFosN/3hsy9Ot0fDJTpzqFJvNLWxgJXtmculo1ksyKacMGZc4+9Ouxj49NFQ4JPl1UpBLZjaWPQ7xuyo3w==, tarball: file:projects/model-my-space.tgz} - version: 0.0.0 - '@rush-temp/model-preference@file:projects/model-preference.tgz': resolution: {integrity: sha512-r2RLrTIRHQ4txZegXOqXQfcPMJmA6HQz5i9EOi8RH7mGB+f6lqnBoYCf+mihfazPXLyF8NXbhPuNX1XHXMqvyg==, tarball: file:projects/model-preference.tgz} version: 0.0.0 @@ -4694,6 +4694,18 @@ packages: resolution: {integrity: sha512-aqU57iG6awiTX9qWSrzXMKyHSbt0V8mKAutQjE3uCx9FdPpnGiZjJflWsMS5PaZ4MdNazv2vUg4XPDHKCc4A/A==, tarball: file:projects/mongo.tgz} version: 0.0.0 + '@rush-temp/my-space-assets@file:projects/my-space-assets.tgz': + resolution: {integrity: sha512-62sXulipAWdzJz56yQZ2axXBdz7zHmd16Mbi5Edu/nqjoSlNcAxZvB6jUNi+kBi6qlO0jNzfNBRrQqQSi0JvMA==, tarball: file:projects/my-space-assets.tgz} + version: 0.0.0 + + '@rush-temp/my-space-resources@file:projects/my-space-resources.tgz': + resolution: {integrity: sha512-ze063pIWYIHyKghTiUGFua9X86uCshjgGnbZKY4WGjg6bIGhU2GTgDOiRDsGC0gWFKt+mag7hQ/nup2zBggY7Q==, tarball: file:projects/my-space-resources.tgz} + version: 0.0.0 + + '@rush-temp/my-space@file:projects/my-space.tgz': + resolution: {integrity: sha512-lZXMkLZnlmpSkjEj4lV2pxIaObjgAQ3OT4ktzUOzlpP1v3U78XKLJzRQ29SqVBYH+DcEHqL97znDPEGxzYHZKA==, tarball: file:projects/my-space.tgz} + version: 0.0.0 + '@rush-temp/notification-assets@file:projects/notification-assets.tgz': resolution: {integrity: sha512-+skvmrHYDNajtAeq2I5tAQXgK0u7WjzquNZXRe+F3zG81/0P3EDIz2k4qjN2HY6EBYZjJHqYsN1ZBWLBbQ2I2g==, tarball: file:projects/notification-assets.tgz} version: 0.0.0 @@ -4726,18 +4738,6 @@ packages: resolution: {integrity: sha512-cjwk9I0RxeNJQTgtbbcQlwiurbp+/T5MbiRnYTLWvxsMBVWnnxD5nToECUt1QdW/CjSSbPsaYP8hoMgt/AufCw==, tarball: file:projects/panel.tgz} version: 0.0.0 - '@rush-temp/my-space-assets@file:projects/my-space-assets.tgz': - resolution: {integrity: sha512-yGiP0aFiYA6RZiY4Ufqhk2egfhWvjEi3GOjcmLZ3eAl3samu/g4b3BcAKzo6SimMwKM2GQF+9oKHn1F/5LmSjA==, tarball: file:projects/my-space-assets.tgz} - version: 0.0.0 - - '@rush-temp/my-space-resources@file:projects/my-space-resources.tgz': - resolution: {integrity: sha512-dE2Jeu1rsu0l18l6oKj0Z+D99sS8fkuAcqoqh9alzavqquUvgGSXtTUB24l6Y6A0tbpshtAMLhmFSFgwPtSGHw==, tarball: file:projects/my-space-resources.tgz} - version: 0.0.0 - - '@rush-temp/my-space@file:projects/my-space.tgz': - resolution: {integrity: sha512-dBx6We9vl3uuETflughn1Q1jmxjzQdxZ0rf+OiZZ6lRM0u304BhlM7459AMcaZ76oxkqZ6ulRYVVxr8k7ZGHaA==, tarball: file:projects/my-space.tgz} - version: 0.0.0 - '@rush-temp/platform-rig@file:projects/platform-rig.tgz': resolution: {integrity: sha512-Ex4y6Gru0FdNgfJ8Q/TOIOZLrvmk+4eDiepGH95XOsHgcTQTfhHPfNwYBgC5yOqQrY9O8GDqWUZtV+KySEAQjg==, tarball: file:projects/platform-rig.tgz} version: 0.0.0 @@ -4859,7 +4859,7 @@ packages: version: 0.0.0 '@rush-temp/prod@file:projects/prod.tgz': - resolution: {integrity: sha512-VeRmwZegE4UJxGZfbKFP55egCMYIBuW6fCawXf1NHcXc93vnE6m9sax3s/O++FU3bMIhusbA0d74ZRRCCozxTw==, tarball: file:projects/prod.tgz} + resolution: {integrity: sha512-0fwdwfrUoXhanhn42lMUJOjDQmkbEur1NnpK4S8nitU/Bg8eyUil9ihjGj3hhVfSdwP7RAPk1iPNeRaAMCAnwQ==, tarball: file:projects/prod.tgz} version: 0.0.0 '@rush-temp/products-assets@file:projects/products-assets.tgz': @@ -5367,7 +5367,7 @@ packages: version: 0.0.0 '@rush-temp/text-editor-resources@file:projects/text-editor-resources.tgz': - resolution: {integrity: sha512-JAu7yul5yHwjxWkBN9p1LW7HR8vAaRlf8Ioiyc7FYAKaQ1EBV05sCCpYsVayVpmU0vU92XzQffryB8TH/dZ6+A==, tarball: file:projects/text-editor-resources.tgz} + resolution: {integrity: sha512-PkvG582CT0XfnKC+4uNE1ZnwUgT9ywmfDmVr5vgcXti04Ntx1rB9VzTqnNDFI/A7h5dFAeEbR8s08gzgO6fdrw==, tarball: file:projects/text-editor-resources.tgz} version: 0.0.0 '@rush-temp/text-editor@file:projects/text-editor.tgz': @@ -5427,7 +5427,7 @@ packages: version: 0.0.0 '@rush-temp/ui@file:projects/ui.tgz': - resolution: {integrity: sha512-tCUHrjveqVL6d3xRq8jtRIT7LdJUzDQFKavGeigF0kmaZxxSA9z5HBNCxszZu/vnK41+FVThVvwsExWnTr2ahA==, tarball: file:projects/ui.tgz} + resolution: {integrity: sha512-THkZLcaBxS58m9cqY59M3XZMTKNmmjb4CWSnh3nv8pzI0uuMHhZ9ldjS6zrzOLQJRlVB7XWuJBT/J5F9oLFs+w==, tarball: file:projects/ui.tgz} version: 0.0.0 '@rush-temp/uploader-assets@file:projects/uploader-assets.tgz': @@ -8405,6 +8405,13 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + emojibase-regex@16.0.0: + resolution: {integrity: sha512-ZMp31BkzBWNW+T73of6NURL6nXQa5GkfKneOkr3cEwBDVllbW/2nuva7NO0J3RjaQ07+SZQNgPTGZ4JlIhmM2Q==} + + emojibase@16.0.0: + resolution: {integrity: sha512-Nw2m7JLIO4Ou2X/yZPRNscHQXVbbr6SErjkJ7EooG7MbR3yDZszCv9KTizsXFc7yZl0n3WF+qUKIC/Lw6H9xaQ==} + engines: {node: '>=18.12.0'} + emojis-list@3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} @@ -19648,20 +19655,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@rush-temp/model-notification@file:projects/model-notification.tgz': - dependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - eslint: 8.56.0 - eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.3.3) - eslint-plugin-import: 2.29.1(eslint@8.56.0) - eslint-plugin-n: 15.7.0(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) - prettier: 3.2.5 - typescript: 5.3.3 - transitivePeerDependencies: - - supports-color - '@rush-temp/model-my-space@file:projects/model-my-space.tgz': dependencies: '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) @@ -19676,6 +19669,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@rush-temp/model-notification@file:projects/model-notification.tgz': + dependencies: + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.3.3) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + prettier: 3.2.5 + typescript: 5.3.3 + transitivePeerDependencies: + - supports-color + '@rush-temp/model-preference@file:projects/model-preference.tgz': dependencies: '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3) @@ -20540,6 +20547,97 @@ snapshots: - supports-color - ts-node + '@rush-temp/my-space-assets@file:projects/my-space-assets.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': + dependencies: + '@types/jest': 29.5.12 + '@types/node': 20.11.19 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + prettier: 3.2.5 + ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - babel-jest + - babel-plugin-macros + - esbuild + - node-notifier + - supports-color + - ts-node + + '@rush-temp/my-space-resources@file:projects/my-space-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': + dependencies: + '@types/jest': 29.5.12 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + fast-equals: 5.2.2 + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + prettier: 3.2.5 + prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.19) + sass: 1.71.1 + svelte: 4.2.19 + svelte-check: 3.6.9(@babel/core@7.23.9)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.19) + svelte-eslint-parser: 0.33.1(svelte@4.2.19) + svelte-loader: 3.2.0(svelte@4.2.19) + svelte-preprocess: 5.1.3(@babel/core@7.23.9)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.19)(typescript@5.6.2) + ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - '@types/node' + - babel-jest + - babel-plugin-macros + - coffeescript + - esbuild + - less + - node-notifier + - postcss + - postcss-load-config + - pug + - stylus + - sugarss + - supports-color + - ts-node + + '@rush-temp/my-space@file:projects/my-space.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': + dependencies: + '@types/jest': 29.5.12 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) + prettier: 3.2.5 + ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - '@types/node' + - babel-jest + - babel-plugin-macros + - esbuild + - node-notifier + - supports-color + - ts-node + '@rush-temp/notification-assets@file:projects/notification-assets.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': dependencies: '@types/jest': 29.5.12 @@ -20795,97 +20893,6 @@ snapshots: - supports-color - ts-node - '@rush-temp/my-space-assets@file:projects/my-space-assets.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': - dependencies: - '@types/jest': 29.5.12 - '@types/node': 20.11.19 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) - eslint: 8.56.0 - eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2) - eslint-plugin-import: 2.29.1(eslint@8.56.0) - eslint-plugin-n: 15.7.0(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) - jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - prettier: 3.2.5 - ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2) - typescript: 5.6.2 - transitivePeerDependencies: - - '@babel/core' - - '@jest/types' - - babel-jest - - babel-plugin-macros - - esbuild - - node-notifier - - supports-color - - ts-node - - '@rush-temp/my-space-resources@file:projects/my-space-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': - dependencies: - '@types/jest': 29.5.12 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) - eslint: 8.56.0 - eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2) - eslint-plugin-import: 2.29.1(eslint@8.56.0) - eslint-plugin-n: 15.7.0(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) - eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - fast-equals: 5.2.2 - jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - prettier: 3.2.5 - prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.19) - sass: 1.71.1 - svelte: 4.2.19 - svelte-check: 3.6.9(@babel/core@7.23.9)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.19) - svelte-eslint-parser: 0.33.1(svelte@4.2.19) - svelte-loader: 3.2.0(svelte@4.2.19) - svelte-preprocess: 5.1.3(@babel/core@7.23.9)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.19)(typescript@5.6.2) - ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2) - typescript: 5.6.2 - transitivePeerDependencies: - - '@babel/core' - - '@jest/types' - - '@types/node' - - babel-jest - - babel-plugin-macros - - coffeescript - - esbuild - - less - - node-notifier - - postcss - - postcss-load-config - - pug - - stylus - - sugarss - - supports-color - - ts-node - - '@rush-temp/my-space@file:projects/my-space.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))': - dependencies: - '@types/jest': 29.5.12 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) - eslint: 8.56.0 - eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2) - eslint-plugin-import: 2.29.1(eslint@8.56.0) - eslint-plugin-n: 15.7.0(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) - jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)) - prettier: 3.2.5 - ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2) - typescript: 5.6.2 - transitivePeerDependencies: - - '@babel/core' - - '@jest/types' - - '@types/node' - - babel-jest - - babel-plugin-macros - - esbuild - - node-notifier - - supports-color - - ts-node - '@rush-temp/platform-rig@file:projects/platform-rig.tgz(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(svelte@4.2.19)': dependencies: '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) @@ -26136,7 +26143,8 @@ snapshots: date-fns: 2.30.0 date-fns-tz: 2.0.0(date-fns@2.30.0) dompurify: 3.1.6 - emoji-regex: 10.3.0 + emojibase: 16.0.0 + emojibase-regex: 16.0.0 eslint: 8.56.0 eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.3.3) eslint-plugin-import: 2.29.1(eslint@8.56.0) @@ -30186,6 +30194,10 @@ snapshots: emoji-regex@9.2.2: {} + emojibase-regex@16.0.0: {} + + emojibase@16.0.0: {} + emojis-list@3.0.0: {} enabled@2.0.0: {} diff --git a/packages/presentation/src/components/markup/NodeContent.svelte b/packages/presentation/src/components/markup/NodeContent.svelte index 6b75dee004..c1c0eabc9f 100644 --- a/packages/presentation/src/components/markup/NodeContent.svelte +++ b/packages/presentation/src/components/markup/NodeContent.svelte @@ -45,6 +45,15 @@ return value !== undefined ? (typeof value === 'string' ? parseInt(value) : value) : undefined } + + const checkEmoji = (nodes: MarkupNode[]): boolean => { + const matches: boolean[] = [] + nodes.forEach((node) => { + const reg = node.text?.match(/\P{Emoji}/gu) + matches.push(reg != null && reg.length > 0 && [65039, 65038, 8205].every((code) => code !== reg[0].charCodeAt(0))) + }) + return matches.every((m) => !m) + } {#if node} @@ -60,7 +69,7 @@ {:else if node.type === MarkupNodeType.text} {node.text} {:else if node.type === MarkupNodeType.paragraph} -

+

{#if nodes.length > 0} {#each nodes as node} @@ -204,6 +213,10 @@ .imgContainer { display: inline; } + .emojiOnly { + font-size: 2rem; + line-height: 115%; + } .img { :global(img) { diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss index e1110ddc22..91c545d5b9 100644 --- a/packages/theme/styles/_colors.scss +++ b/packages/theme/styles/_colors.scss @@ -186,6 +186,8 @@ --theme-checkbox-disabled: #999; --theme-progress-color: #FFFFFF; --theme-popup-color: #2A2939; + --theme-popup-trans-color: #2A2939ee; + --theme-popup-trans-gradient: linear-gradient(to bottom, #2A2939ff, #2A293900); --theme-popup-hover: #333240; --theme-popup-divider: rgba(255, 255, 255, .09); --theme-popup-header: #3A3A47; @@ -478,6 +480,8 @@ --theme-checkbox-disabled: #999; --theme-progress-color: rgba(0, 0, 0, .5); --theme-popup-color: #FFFFFF; + --theme-popup-trans-color: #FFFFFFee; + --theme-popup-trans-gradient: linear-gradient(to bottom, #FFFf, #FFF0); --theme-popup-hover: #EBEBEB; --theme-popup-divider: rgba(0, 0, 0, .09); --theme-popup-header: #EBEBEB; diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index ff4842d656..fb6e9bbec2 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -286,7 +286,7 @@ input.search { .items-baseline { align-items: baseline; } .items-start { align-items: flex-start; } .items-end { align-items: flex-end; } -.items-center { align-items: center; } +.items-center { align-items: center !important; } .items-stretch { align-items: stretch; } .self-start { align-self: flex-start; } .self-end { align-self: flex-end; } @@ -1046,7 +1046,7 @@ a.no-line { .tertiary-textColor { color: var(--global-tertiary-TextColor) !important; } .content-primary-color { color: var(--primary-button-color); } -.red-color { color: var(--highlight-red); } +.red-color { color: var(--highlight-red) !important; } .error-color { color: var(--theme-error-color); } .sunshine-text-color { color: var(--tag-accent-SunshineText) !important; } diff --git a/packages/theme/styles/popups.scss b/packages/theme/styles/popups.scss index 9455d0e570..c26ce2fdb4 100644 --- a/packages/theme/styles/popups.scss +++ b/packages/theme/styles/popups.scss @@ -17,9 +17,6 @@ .hulyPopup-container { display: flex; flex-direction: column; - padding: 1px; - min-width: 15rem; - max-width: 15rem; max-height: 22.625rem; background: var(--theme-popup-color); // var(--global-popover-BackgroundColor); border: 1px solid var(--theme-popup-divider); // var(--global-popover-BorderColor); @@ -31,6 +28,11 @@ var(--global-popover-ShadowSpread) var(--global-popover-ShadowColor); + &:not(.noPadding) { padding: 1px; } + &:not(.autoWidth) { + min-width: 16.5rem; + max-width: 16.5rem; + } .hulyPopup-row { display: flex; justify-content: space-between; @@ -97,11 +99,29 @@ border: 1px solid var(--theme-button-border); border-radius: var(--extra-small-BorderRadius); } - } - - &:hover { - background-color: var(--theme-popup-hover); // var(--global-popover-hover-BackgroundColor); } + + &:not(.disabled, :disabled):hover { + background-color: var(--theme-popup-hover); // var(--global-popover-hover-BackgroundColor); + cursor: pointer; + } + &.disabled, + &:disabled { + cursor: default; + .hulyPopup-row__label { opacity: .5; } + } + } + .hulyPopup-group { + display: flex; + flex-direction: column; + flex-shrink: 0; + padding: var(--spacing-0_5); + } + .hulyPopup-divider { + flex-shrink: 0; + width: 100%; + height: 1px; + background-color: var(--theme-popup-divider); } } @@ -339,12 +359,15 @@ width: auto; min-height: 0; min-width: 0; - max-width: 30rem; - background: var(--theme-popup-color); - border: 1px solid var(--theme-popup-divider); - border-radius: .5rem; - box-shadow: var(--theme-popup-shadow); user-select: none; + + &:not(.embedded) { + max-width: 30rem; + background: var(--theme-popup-color); + border-radius: .5rem; + border: 1px solid var(--theme-popup-divider); + box-shadow: var(--theme-popup-shadow); + } &.isDock { border-radius: 0; @@ -518,7 +541,8 @@ .ap-menuHeader { display: flex; flex-direction: column; - border-bottom: 1px solid var(--theme-popup-divider); + + &:not(.noBorder) { border-bottom: 1px solid var(--theme-popup-divider); } .tabs { display: flex; @@ -539,19 +563,24 @@ &:not(:last-child) { margin-right: .375rem; } &:not(.selected, .disabled) { cursor: pointer; } &.disabled { color: var(--theme-darker-color); } - &.selected { - color: var(--theme-caption-color); + &.selected { color: var(--theme-caption-color); } + } - &::after { - position: absolute; - content: ''; - left: 0; - bottom: -1px; - width: 100%; - height: 2px; - background-color: var(--theme-link-color); - } - } + &:not(.bordered) .tab.selected::after { + position: absolute; + content: ''; + left: 0; + bottom: -1px; + width: 100%; + height: 2px; + background-color: var(--theme-link-color); + } + &.bordered .tab { + min-height: 2.25rem; + border: 1px solid transparent; + border-radius: .375rem; + + &.selected { border-color: var(--theme-button-border); } } } } diff --git a/packages/ui/lang/cs.json b/packages/ui/lang/cs.json index c2b74ca0c4..c6eb895ff3 100644 --- a/packages/ui/lang/cs.json +++ b/packages/ui/lang/cs.json @@ -26,6 +26,7 @@ "ShowLess": "Zobrazit méně", "Search": "Hledat", "SearchDots": "Hledám...", + "SearchResults": "Výsledky vyhledávání", "Suggested": "Doporučeno", "TimeTooltip": "{value}", "SelectDate": "Vybrat datum", @@ -75,14 +76,26 @@ "MM": "MM", "YYYY": "RRRR", "HH": "HH", - "GettingWorkDone": "Dokončování práce", - "ExpressYourself": "Vyjádřete se", - "Smileys": "Smajlíci", - "Nature": "Příroda", - "Symbols": "Symboly", + "SmileysAndPeople": "Smajlíky & Lidé", + "Components": "Součást", + "AnimalsAndNature": "Zvířata & Příroda", + "FoodAndDrink": "Jídlo & Pití", "TravelAndPlaces": "Cestování a místa", + "Activities": "Aktivita", "Objects": "Objekty", - "Food": "Jídlo", + "Symbols": "Symboly", + "Flags": "Příznak", + "FrequentlyUsed": "Často používané", + "GettingWorkDone": "Dokončování práce", + "DefaultSkinTone": "Výchozí tón pleti", + "NoTone": "Žádný tón", + "Light": "Světlo", + "MediumLight": "Středně světlý", + "Medium": "Střední", + "MediumDark": "Středně tmavý", + "Dark": "Tmavý", + "Remove": "Odstranit", + "NoResults": "Žádné Výsledky", "MoreCount": "Ještě {count}", "Spacious": "Prostorný", "Compact": "Kompaktní", diff --git a/packages/ui/lang/de.json b/packages/ui/lang/de.json index be5d01f765..084fcd50e0 100644 --- a/packages/ui/lang/de.json +++ b/packages/ui/lang/de.json @@ -26,6 +26,7 @@ "ShowLess": "Weniger anzeigen", "Search": "Suchen", "SearchDots": "Suchen...", + "SearchResults": "Suchergebnisse", "Suggested": "Vorgeschlagen", "TimeTooltip": "{value}", "SelectDate": "Datum auswählen", @@ -74,14 +75,26 @@ "MM": "MM", "YYYY": "JJJJ", "HH": "HH", - "GettingWorkDone": "Arbeit erledigen", - "ExpressYourself": "Ausdrücken", - "Smileys": "Smileys", - "Nature": "Natur", - "Symbols": "Symbole", + "SmileysAndPeople": "Smileys & Personen", + "Components": "Hauptkomponenten", + "AnimalsAndNature": "Tiere & Natur", + "FoodAndDrink": "Essen & Trinken", "TravelAndPlaces": "Reisen & Orte", + "Activities": "Aktivitäten", "Objects": "Objekte", - "Food": "Essen", + "Symbols": "Symbole", + "Flags": "Flags", + "FrequentlyUsed": "Häufig verwendet", + "GettingWorkDone": "Arbeit erledigen", + "DefaultSkinTone": "Standard-Hautton", + "NoTone": "Kein Ton", + "Light": "Leicht", + "MediumLight": "Mittelhell", + "Medium": "Mittel", + "MediumDark": "Mitteldunkel", + "Dark": "Dunkel", + "Remove": "Entfernen", + "NoResults": "Keine Ergebnisse", "MoreCount": "{count} weitere", "Spacious": "Geräumig", "Compact": "Kompakt", diff --git a/packages/ui/lang/en.json b/packages/ui/lang/en.json index bae209beab..366e5c1498 100644 --- a/packages/ui/lang/en.json +++ b/packages/ui/lang/en.json @@ -26,6 +26,7 @@ "ShowLess": "Show less", "Search": "Search", "SearchDots": "Search...", + "SearchResults": "Search Results", "Suggested": "Suggested", "TimeTooltip": "{value}", "SelectDate": "Select date", @@ -75,14 +76,26 @@ "MM": "MM", "YYYY": "YYYY", "HH": "HH", - "GettingWorkDone": "Getting work done", - "ExpressYourself": "Express yourself", - "Smileys": "Smileys", - "Nature": "Nature", - "Symbols": "Symbols", + "SmileysAndPeople": "Smileys & People", + "Components": "Components", + "AnimalsAndNature": "Animals & Nature", + "FoodAndDrink": "Food & Drink", "TravelAndPlaces": "Travel & Places", + "Activities": "Activities", "Objects": "Objects", - "Food": "Food", + "Symbols": "Symbols", + "Flags": "Flags", + "FrequentlyUsed": "Frequently used", + "GettingWorkDone": "Getting work done", + "DefaultSkinTone": "Default skin tone", + "NoTone": "No tone", + "Light": "Light", + "MediumLight": "Medium-light", + "Medium": "Medium", + "MediumDark": "Medium-dark", + "Dark": "Dark", + "Remove": "Remove", + "NoResults": "No Results", "MoreCount": "{count} more", "Spacious": "Spacious", "Compact": "Compact", diff --git a/packages/ui/lang/es.json b/packages/ui/lang/es.json index 5ce75309e2..14326f5ae6 100644 --- a/packages/ui/lang/es.json +++ b/packages/ui/lang/es.json @@ -26,6 +26,7 @@ "ShowLess": "Mostrar menos", "Search": "Buscar", "SearchDots": "Buscar...", + "SearchResults": "Resultados de la búsqueda", "Suggested": "Sugerido", "TimeTooltip": "{value}", "SelectDate": "Seleccionar fecha", @@ -75,14 +76,26 @@ "MM": "MM", "YYYY": "AAAA", "HH": "HH", - "GettingWorkDone": "Haciendo el trabajo", - "ExpressYourself": "Exprésate", - "Smileys": "Emoticonos", - "Nature": "Naturaleza", - "Symbols": "Símbolos", + "SmileysAndPeople": "Emoticonos y Personas", + "Components": "Componentes", + "AnimalsAndNature": "Animales y Naturaleza", + "FoodAndDrink": "Comida y Bebida", "TravelAndPlaces": "Viajes y lugares", + "Activities": "Actividades", "Objects": "Objetos", - "Food": "Comida", + "Symbols": "Símbolos", + "Flags": "Banderas", + "FrequentlyUsed": "De uso frecuente", + "GettingWorkDone": "Haciendo el trabajo", + "DefaultSkinTone": "Tono de piel predeterminado", + "NoTone": "Sin tono", + "Light": "Claro", + "MediumLight": "Medio-Сlaro", + "Medium": "Medio", + "MediumDark": "Medio-Oscuro", + "Dark": "Oscuro", + "Remove": "Eliminar", + "NoResults": "Sin Resultados", "MoreCount": "{count} más", "Spacious": "Espacioso", "Compact": "Compacto", diff --git a/packages/ui/lang/fr.json b/packages/ui/lang/fr.json index eec4412449..42353dcf0b 100644 --- a/packages/ui/lang/fr.json +++ b/packages/ui/lang/fr.json @@ -26,6 +26,7 @@ "ShowLess": "Afficher moins", "Search": "Rechercher", "SearchDots": "Recherche...", + "SearchResults": "Résultats de la recherche", "Suggested": "Suggéré", "TimeTooltip": "{value}", "SelectDate": "Sélectionner une date", @@ -75,14 +76,26 @@ "MM": "MM", "YYYY": "AAAA", "HH": "HH", - "GettingWorkDone": "Faire le travail", - "ExpressYourself": "Exprime-toi", - "Smileys": "Émoticônes", - "Nature": "Nature", - "Symbols": "Symboles", + "SmileysAndPeople": "Smileys & Personnes", + "Components": "Composants", + "AnimalsAndNature": "Animaux & Nature", + "FoodAndDrink": "Nourriture & Boissons", "TravelAndPlaces": "Voyages & Lieux", + "Activities": "Activités", "Objects": "Objets", - "Food": "Nourriture", + "Symbols": "Symboles", + "Flags": "Drapeaux", + "FrequentlyUsed": "Fréquemment utilisé", + "GettingWorkDone": "Faire le travail", + "DefaultSkinTone": "Teint par défaut", + "NoTone": "Pas de tonalité", + "Light": "Clair", + "MediumLight": "Moyen-clair", + "Medium": "Moyen", + "MediumDark": "Moyen-foncé", + "Dark": "Foncé", + "Remove": "Supprimer", + "NoResults": "Aucun Résultat", "MoreCount": "{count} de plus", "Spacious": "Spacieux", "Compact": "Compact", diff --git a/packages/ui/lang/it.json b/packages/ui/lang/it.json index 76a8d154ee..fd1fcad7cd 100644 --- a/packages/ui/lang/it.json +++ b/packages/ui/lang/it.json @@ -26,6 +26,7 @@ "ShowLess": "Mostra meno", "Search": "Cerca", "SearchDots": "Cerca...", + "SearchResults": "Risultati ricerca", "Suggested": "Suggerito", "TimeTooltip": "{value}", "SelectDate": "Seleziona data", @@ -75,14 +76,26 @@ "MM": "MM", "YYYY": "AAAA", "HH": "HH", - "GettingWorkDone": "Completamento del lavoro", - "ExpressYourself": "Esprimi te stesso", - "Smileys": "Faccine", - "Nature": "Natura", - "Symbols": "Simboli", + "SmileysAndPeople": "Faccine & Persone", + "Components": "Componente", + "AnimalsAndNature": "Animali & Natura", + "FoodAndDrink": "Cibo & Bevande", "TravelAndPlaces": "Viaggi e luoghi", + "Activities": "Attivita", "Objects": "Oggetti", - "Food": "Cibo", + "Symbols": "Simboli", + "Flags": "Bandiera", + "FrequentlyUsed": "Usato frequentemente", + "GettingWorkDone": "Completamento del lavoro", + "DefaultSkinTone": "Tono della pelle predefinito", + "NoTone": "Nessun tono", + "Light": "Chiaro", + "MediumLight": "Medio-chiaro", + "Medium": "Medio", + "MediumDark": "Medio-scuro", + "Dark": "Scuro", + "Remove": "Rimuovere", + "NoResults": "Nessun risultato", "MoreCount": "{count} in più", "Spacious": "Ampio", "Compact": "Compatto", diff --git a/packages/ui/lang/pt.json b/packages/ui/lang/pt.json index b4a7919abc..efc78425fd 100644 --- a/packages/ui/lang/pt.json +++ b/packages/ui/lang/pt.json @@ -26,6 +26,7 @@ "ShowLess": "Mostrar menos", "Search": "Pesquisar", "SearchDots": "Pesquisar...", + "SearchResults": "Resultados da pesquisa", "Suggested": "Sugerido", "TimeTooltip": "{value}", "SelectDate": "Selecionar data", @@ -75,14 +76,26 @@ "MM": "MM", "YYYY": "AAAA", "HH": "HH", - "GettingWorkDone": "A fazer", - "ExpressYourself": "Expressa-te", - "Smileys": "Emoticons", - "Nature": "Natureza", - "Symbols": "Símbolos", + "SmileysAndPeople": "Carinhas & Pessoas", + "Components": "Componentes", + "AnimalsAndNature": "Animais & Natureza", + "FoodAndDrink": "Alimentos & Bebidas", "TravelAndPlaces": "Viagens e Locais", + "Activities": "Actividades", "Objects": "Objetos", - "Food": "Comida", + "Symbols": "Símbolos", + "Flags": "Bandeiras", + "FrequentlyUsed": "Frequentemente utilizado", + "GettingWorkDone": "A fazer", + "DefaultSkinTone": "Tom de pele padrão", + "NoTone": "Sem tom", + "Light": "Claro", + "MediumLight": "Médio Claro", + "Medium": "Médio", + "MediumDark": "Médio Escuro", + "Dark": "Escuro", + "Remove": "Remover", + "NoResults": "Sem Resultados", "MoreCount": "{count} mais", "Spacious": "Espaçoso", "Compact": "Compacto", diff --git a/packages/ui/lang/ru.json b/packages/ui/lang/ru.json index 4e84c455c0..080cd5559d 100644 --- a/packages/ui/lang/ru.json +++ b/packages/ui/lang/ru.json @@ -26,6 +26,7 @@ "ShowLess": "Показать меньше", "Search": "Поиск", "SearchDots": "Поиск...", + "SearchResults": "Результаты поиска", "Suggested": "Предложено", "TimeTooltip": "{value}", "SelectDate": "Выберите дату", @@ -75,14 +76,26 @@ "MM": "ММ", "YYYY": "ГГГГ", "HH": "ЧЧ", - "GettingWorkDone": "Для работы", - "ExpressYourself": "Вырази себя", - "Smileys": "Смайлики", - "Nature": "Природа", - "Symbols": "Символы", + "SmileysAndPeople": "Эмоции & Люди", + "Components": "Компоненты", + "AnimalsAndNature": "Животные & Природа", + "FoodAndDrink": "Еда & Напитки", "TravelAndPlaces": "Путешествия & Места", + "Activities": "Варианты досуга", "Objects": "Объекты", - "Food": "Еда", + "Symbols": "Символы", + "Flags": "Флаги", + "FrequentlyUsed": "Часто используемые", + "GettingWorkDone": "Для работы", + "DefaultSkinTone": "Тон кожи по умолчанию", + "NoTone": "Без тона", + "Light": "Cветлый", + "MediumLight": "Cредне-светлый", + "Medium": "Средний", + "MediumDark": "Средне-темный", + "Dark": "Темный", + "Remove": "Удалить", + "NoResults": "Никаких результатов", "MoreCount": "Ещё {count}", "Spacious": "Просторный", "Compact": "Компактный", diff --git a/packages/ui/lang/zh.json b/packages/ui/lang/zh.json index f6af346b9a..624d283026 100644 --- a/packages/ui/lang/zh.json +++ b/packages/ui/lang/zh.json @@ -26,6 +26,7 @@ "ShowLess": "显示更少", "Search": "搜索", "SearchDots": "搜索...", + "SearchResults": "搜寻结果", "Suggested": "推荐", "TimeTooltip": "{value}", "SelectDate": "选择日期", @@ -75,14 +76,26 @@ "MM": "月", "YYYY": "年", "HH": "小时", - "GettingWorkDone": "完成工作", - "ExpressYourself": "表达自己", - "Smileys": "表情符号", - "Nature": "自然", - "Symbols": "符号", + "SmileysAndPeople": "微笑与人", + "Components": "组件", + "AnimalsAndNature": "动物与自然", + "FoodAndDrink": "食物及饮品", "TravelAndPlaces": "旅行和地点", + "Activities": "活动", "Objects": "物体", - "Food": "食物", + "Symbols": "符号", + "Flags": "旗帜", + "FrequentlyUsed": "经常使用", + "GettingWorkDone": "完成工作", + "DefaultSkinTone": "默认肤色", + "NoTone": "违约情况", + "Light": "光", + "MediumLight": "中光", + "Medium": "中等", + "MediumDark": "中暗", + "Dark": "黑暗", + "Remove": "移走", + "NoResults": "没有结果", "MoreCount": "还有 {count} 个", "Spacious": "宽敞", "Compact": "紧凑", diff --git a/packages/ui/package.json b/packages/ui/package.json index 3dde887e56..0228cfc08e 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -45,11 +45,11 @@ "svelte": "^4.2.19", "fast-equals": "^5.2.2", "autolinker": "4.0.0", - "emoji-regex": "^10.1.0", "date-fns": "^2.30.0", "date-fns-tz": "^2.0.0", "dompurify": "^3.1.6", - "@hcengineering/analytics": "^0.6.0" + "@hcengineering/analytics": "^0.6.0", + "emojibase": "^16.0.0" }, "repository": "https://github.com/hcengineering/platform", "publishConfig": { diff --git a/packages/ui/src/components/EmojiPopup.svelte b/packages/ui/src/components/EmojiPopup.svelte deleted file mode 100644 index 161d029c55..0000000000 --- a/packages/ui/src/components/EmojiPopup.svelte +++ /dev/null @@ -1,315 +0,0 @@ - - -

- -
- - {#each categories as category} -
-
-
- {#each category.emojis as emoji} - {#if emoji !== undefined} - - -
{ - if (disabled) return - - dispatch('close', emoji) - }} - > - {emoji} -
- {/if} - {/each} -
- {/each} -
-
-
-
- - diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte index e8b03b2506..de14cf8f3f 100644 --- a/packages/ui/src/components/Scroller.svelte +++ b/packages/ui/src/components/Scroller.svelte @@ -106,26 +106,28 @@ if (divBar && divScroll) { dispatch('divScrollTop', divScroll.scrollTop) - const trackH = divScroll.clientHeight - shiftTop - shiftBottom - 4 + const visibleTrack = divScroll.clientHeight - shiftTop - shiftBottom - 4 const scrollH = divScroll.scrollHeight - const proc = scrollH / trackH + const proc = scrollH / visibleTrack - const newHeight = (divScroll.clientHeight - 4) / proc - const newHeightPx = newHeight + 'px' - if (divBar.style.height !== 'newHeight') { - divBar.style.height = newHeightPx - } + const _newHeight = visibleTrack / proc + const newHeight = _newHeight < 2 * fz ? 2 * fz : _newHeight + const newHeightPx = `${newHeight}px` + const procSpace = (scrollH - divScroll.clientHeight) / (visibleTrack - newHeight) let newTop = '0px' if (scrollDirection === 'vertical-reverse') { - newTop = divScroll.clientHeight + divScroll.scrollTop / proc - newHeight - shiftTop - 2 + 'px' + newTop = divScroll.clientHeight + divScroll.scrollTop / procSpace - newHeight - shiftTop - 2 + 'px' } else { - newTop = divScroll.scrollTop / proc + shiftTop + 2 + 'px' + newTop = divScroll.scrollTop / procSpace + shiftTop + 2 + 'px' } if (divBar.style.top !== newTop) { divBar.style.top = newTop } + if (divBar.style.height !== newHeightPx) { + divBar.style.height = newHeightPx + } if (mask === 'none') { if (divBar.style.visibility !== 'hidden') { divBar.style.visibility = 'hidden' diff --git a/packages/ui/src/components/SearchInput.svelte b/packages/ui/src/components/SearchInput.svelte index 53e897a88b..a6ce7b0a27 100644 --- a/packages/ui/src/components/SearchInput.svelte +++ b/packages/ui/src/components/SearchInput.svelte @@ -16,7 +16,7 @@ import type { IntlString } from '@hcengineering/platform' import { translateCB } from '@hcengineering/platform' import { themeStore } from '@hcengineering/theme' - import { createEventDispatcher, onDestroy } from 'svelte' + import { createEventDispatcher, onDestroy, onMount } from 'svelte' import plugin from '../plugin' import IconClose from './icons/Close.svelte' import IconSearch from './icons/Search.svelte' @@ -25,6 +25,9 @@ export let placeholder: IntlString = plugin.string.Search export let placeholderParam: any | undefined = undefined export let collapsed: boolean = false + export let autoFocus: boolean = false + export let width: string | undefined = undefined + export let delay: number = 500 let input: HTMLInputElement let phTranslate: string = '' @@ -42,14 +45,20 @@ timer = setTimeout(() => { value = _search dispatch('change', _search) - }, 500) + }, delay) } onDestroy(() => { clearTimeout(timer) }) + onMount(() => { + if (autoFocus && input) { + autoFocus = false + input.focus() + } + }) -