diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d273cbafad..a4fcb384ed 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -17676,7 +17676,7 @@ packages: dev: false file:projects/calendar-resources.tgz_a1d864769aaf53d09b76fe134ab55e60: - resolution: {integrity: sha512-/KSbpPzT33ajfBoTvXd075rtPPiYnC1XOF7eI/8lKcCofw3gBCY5ZT3qgxmwwGqWzx/Sfdzp0TwAQhqsGgtcrg==, tarball: file:projects/calendar-resources.tgz} + resolution: {integrity: sha512-zNDWSAzkH0tXFVIy8dr2OUI92YvnIvsxSGpeQuLq3yiXUfCCaRKoROIPeQebjsPzmgwv/KvX32/UojKxQdebxA==, tarball: file:projects/calendar-resources.tgz} id: file:projects/calendar-resources.tgz name: '@rush-temp/calendar-resources' version: 0.0.0 @@ -17689,6 +17689,7 @@ packages: eslint-plugin-n: 15.5.1_eslint@8.27.0 eslint-plugin-promise: 6.1.1_eslint@8.27.0 eslint-plugin-svelte3: 4.0.0_eslint@8.27.0+svelte@3.55.1 + fast-equals: 2.0.4 prettier: 2.8.8 prettier-plugin-svelte: 2.8.0_prettier@2.8.8+svelte@3.55.1 sass: 1.56.1 diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts index dbb076d515..5c26877355 100644 --- a/packages/ui/src/index.ts +++ b/packages/ui/src/index.ts @@ -111,6 +111,7 @@ export { default as ScrollerBar } from './components/ScrollerBar.svelte' export { default as TabList } from './components/TabList.svelte' export { default as Chevron } from './components/Chevron.svelte' export { default as Timeline } from './components/Timeline.svelte' +export { default as TimeShiftPresenter } from './components/TimeShiftPresenter.svelte' export { default as IconAdd } from './components/icons/Add.svelte' export { default as IconStart } from './components/icons/Start.svelte' diff --git a/plugins/calendar-assets/lang/en.json b/plugins/calendar-assets/lang/en.json index df11f6063c..4837498170 100644 --- a/plugins/calendar-assets/lang/en.json +++ b/plugins/calendar-assets/lang/en.json @@ -75,6 +75,7 @@ "Times": "{count, plural, one {time} other {times}}", "AddParticipants": "Add participants", "Sync": "Synchronization", - "Busy": "Busy" + "Busy": "Busy", + "AddReminder": "Add reminder" } } \ No newline at end of file diff --git a/plugins/calendar-assets/lang/ru.json b/plugins/calendar-assets/lang/ru.json index 37f01da0c0..1ff2a93f27 100644 --- a/plugins/calendar-assets/lang/ru.json +++ b/plugins/calendar-assets/lang/ru.json @@ -75,6 +75,7 @@ "Times": "{count, plural, one {раз} few {раза} other {раз}}", "AddParticipants": "Добавить участников", "Sync": "Синхронизация", - "Busy": "Занято" + "Busy": "Занято", + "AddReminder": "Добавить напоминание" } } \ No newline at end of file diff --git a/plugins/calendar-resources/package.json b/plugins/calendar-resources/package.json index 43424cca30..4a18c99080 100644 --- a/plugins/calendar-resources/package.json +++ b/plugins/calendar-resources/package.json @@ -37,6 +37,7 @@ "@hcengineering/ui": "^0.6.10", "@hcengineering/presentation": "^0.6.2", "@hcengineering/calendar": "^0.6.14", + "@hcengineering/setting": "^0.6.9", "@hcengineering/theme": "^0.6.3", "svelte": "3.55.1", "@hcengineering/text-editor": "^0.6.0", @@ -45,6 +46,7 @@ "@hcengineering/contact-resources": "^0.6.0", "@hcengineering/view-resources": "^0.6.0", "@hcengineering/view": "^0.6.8", - "@hcengineering/workbench": "^0.6.8" + "@hcengineering/workbench": "^0.6.8", + "fast-equals": "^2.0.3" } } diff --git a/plugins/calendar-resources/src/components/AddParticipant.svelte b/plugins/calendar-resources/src/components/AddParticipant.svelte index 14d7cb1429..7c863e3b6d 100644 --- a/plugins/calendar-resources/src/components/AddParticipant.svelte +++ b/plugins/calendar-resources/src/components/AddParticipant.svelte @@ -13,20 +13,26 @@ // limitations under the License. --> @@ -117,6 +171,14 @@ use:resizeObserver={(element) => { parentWidth = element.parentElement?.getBoundingClientRect().width }} + on:keydown={(ev) => { + if (ev.key === 'Enter') { + ev.preventDefault() + ev.stopPropagation() + dispatch('enter', value) + value = '' + } + }} >