v3.0.2

Fixed so that ResourceTimeline plugin does not depend on ResourceTimeGrid Fixed minor visual defects in ResourceTimeline view
vkurko · Jun 3, 2024 · a3f2565 · a3f2565
1 parent 371637a
commit a3f2565
Show file tree

Hide file tree

Showing 31 changed files with 143 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Event Calendar changelog
 
+## 3.0.2
+June 3, 2024
+
+* Fixed so that `ResourceTimeline` plugin does not depend on `ResourceTimeGrid`
+* Fixed minor visual defects in `ResourceTimeline` view
+
 ## 3.0.1
 May 24, 2024
 

diff --git a/README.md b/README.md
@@ -202,8 +202,8 @@ import '@event-calendar/core/index.css';
 ### Pre-built browser ready bundle
 Include the following lines of code in the `<head>` section of your page:
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.css">
-<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.css">
+<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.js"></script>
 ```
 
 <details>

diff --git a/docs/index.html b/docs/index.html
@@ -12,8 +12,8 @@
     <link rel="manifest" href="site.webmanifest">
     <link rel="stylesheet" href="global.css?20231021">
 
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.css">
-    <script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.css">
+    <script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.js"></script>
     <!-- Yandex.Metrika counter -->
     <script type="text/javascript" >
         (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "event-calendar",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",
@@ -13,14 +13,14 @@
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
     "@babel/runtime-corejs3": "^7.24.5",
-    "@event-calendar/build": "~3.0.1",
-    "@event-calendar/core": "~3.0.1",
-    "@event-calendar/day-grid": "~3.0.1",
-    "@event-calendar/interaction": "~3.0.1",
-    "@event-calendar/list": "~3.0.1",
-    "@event-calendar/resource-time-grid": "~3.0.1",
-    "@event-calendar/resource-timeline": "~3.0.1",
-    "@event-calendar/time-grid": "~3.0.1",
+    "@event-calendar/build": "~3.0.2",
+    "@event-calendar/core": "~3.0.2",
+    "@event-calendar/day-grid": "~3.0.2",
+    "@event-calendar/interaction": "~3.0.2",
+    "@event-calendar/list": "~3.0.2",
+    "@event-calendar/resource-time-grid": "~3.0.2",
+    "@event-calendar/resource-timeline": "~3.0.2",
+    "@event-calendar/time-grid": "~3.0.2",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",

diff --git a/packages/build/README.md b/packages/build/README.md
@@ -202,8 +202,8 @@ import '@event-calendar/core/index.css';
 ### Pre-built browser ready bundle
 Include the following lines of code in the `<head>` section of your page:
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.css">
-<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.css">
+<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.js"></script>
 ```
 
 <details>

diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-calendar/build",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "title": "Event Calendar",
   "description": "Full-sized drag & drop event calendar with resource & timeline views",
   "keywords": [
@@ -20,11 +20,11 @@
   "jsdelivr": "event-calendar.min.js",
   "style": "event-calendar.min.css",
   "devDependencies": {
-    "@event-calendar/day-grid": "~3.0.1",
-    "@event-calendar/interaction": "~3.0.1",
-    "@event-calendar/list": "~3.0.1",
-    "@event-calendar/time-grid": "~3.0.1",
-    "@event-calendar/resource-time-grid": "~3.0.1",
-    "@event-calendar/resource-timeline": "~3.0.1"
+    "@event-calendar/day-grid": "~3.0.2",
+    "@event-calendar/interaction": "~3.0.2",
+    "@event-calendar/list": "~3.0.2",
+    "@event-calendar/time-grid": "~3.0.2",
+    "@event-calendar/resource-time-grid": "~3.0.2",
+    "@event-calendar/resource-timeline": "~3.0.2"
   }
 }
diff --git a/packages/core/README.md b/packages/core/README.md
@@ -202,8 +202,8 @@ import '@event-calendar/core/index.css';
 ### Pre-built browser ready bundle
 Include the following lines of code in the `<head>` section of your page:
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.css">
-<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.css">
+<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.js"></script>
 ```
 
 <details>

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-calendar/core",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "title": "Event Calendar Core package",
   "description": "Full-sized drag & drop event calendar with resource & timeline views",
   "keywords": [

diff --git a/packages/core/src/lib.js b/packages/core/src/lib.js
@@ -5,6 +5,7 @@ export * from './lib/debounce.js';
 export * from './lib/dom.js';
 export * from './lib/events.js';
 export * from './lib/options.js';
+export * from './lib/resources.js';
 export * from './lib/stores.js';
 export * from './lib/times.js';
 export * from './lib/utils.js';

diff --git a/packages/resource-time-grid/src/lib.js → packages/core/src/lib/resources.js b/packages/resource-time-grid/src/lib.js → packages/core/src/lib/resources.js
diff --git a/packages/core/src/lib/stores.js b/packages/core/src/lib/stores.js
@@ -1,6 +1,7 @@
 import {derived} from 'svelte/store';
 import {is_function} from 'svelte/internal';
 import {toLocalDate} from './date';
+import {createResources} from './resources.js';
 
 export function intl(locale, format) {
     return derived([locale, format], ([$locale, $format]) => {
@@ -61,3 +62,34 @@ function _getParts(source, parts) {
     }
     return result;
 }
+
+export function viewResources(state) {
+    return derived(
+        [state.resources, state.filterResourcesWithEvents, state._events, state._activeRange],
+        ([$resources, $filterResourcesWithEvents, $_events, $_activeRange]) => {
+            let result = $resources;
+
+            if ($filterResourcesWithEvents) {
+                result = $resources.filter(resource => {
+                    for (let event of $_events) {
+                        if (
+                            event.display !== 'background' &&
+                            event.resourceIds.includes(resource.id) &&
+                            event.start < $_activeRange.end &&
+                            event.end > $_activeRange.start
+                        ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                });
+            }
+
+            if (!result.length) {
+                result = createResources([{}]);
+            }
+
+            return result;
+        }
+    );
+}
diff --git a/packages/core/src/storage/options.js b/packages/core/src/storage/options.js
@@ -1,4 +1,13 @@
-import {assign, createDate, createDuration, keys, setMidnight, createEvents, createEventSources} from '../lib.js';
+import {
+    assign,
+    createDate,
+    createDuration,
+    keys,
+    setMidnight,
+    createEvents,
+    createEventSources,
+    createResources
+} from '../lib.js';
 
 export function createOptions(plugins) {
     let options = {
@@ -36,6 +45,7 @@ export function createOptions(plugins) {
             hour: 'numeric',
             minute: '2-digit'
         },
+        filterResourcesWithEvents: false,
         firstDay: 0,
         flexibleSlotTimeLimits: false,  // ec option
         headerToolbar: {
@@ -130,6 +140,7 @@ export function createParsers(plugins) {
         eventSources: createEventSources,
         hiddenDays: days => [...new Set(days)],
         highlightedDates: dates => dates.map(createDate),
+        resources: createResources,
         scrollTime: createDuration,
         slotDuration: createDuration,
         slotMaxTime: createDuration,

diff --git a/packages/core/src/styles/timeline.scss b/packages/core/src/styles/timeline.scss
@@ -117,6 +117,7 @@
     .ec-sidebar-title {
       flex-shrink: 0;
       border-bottom: 1px solid var(--ec-border-color);
+      box-sizing: content-box;
     }
 
     .ec-content {

diff --git a/packages/day-grid/README.md b/packages/day-grid/README.md
@@ -202,8 +202,8 @@ import '@event-calendar/core/index.css';
 ### Pre-built browser ready bundle
 Include the following lines of code in the `<head>` section of your page:
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.css">
-<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.css">
+<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.js"></script>
 ```
 
 <details>

diff --git a/packages/day-grid/package.json b/packages/day-grid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-calendar/day-grid",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "title": "Event Calendar DayGrid plugin",
   "description": "Full-sized drag & drop event calendar with resource & timeline views",
   "keywords": [
@@ -27,7 +27,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@event-calendar/core": "~3.0.1",
+    "@event-calendar/core": "~3.0.2",
     "svelte": "^4.2.16"
   }
 }
diff --git a/packages/interaction/README.md b/packages/interaction/README.md
@@ -202,8 +202,8 @@ import '@event-calendar/core/index.css';
 ### Pre-built browser ready bundle
 Include the following lines of code in the `<head>` section of your page:
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.css">
-<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.1/event-calendar.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.css">
+<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.0.2/event-calendar.min.js"></script>
 ```
 
 <details>