Merge branch 'dev' into gh-pages

.github/workflows/ci.yml

@@ -61,11 +61,6 @@ jobs:
                 path: src/playwright/playwright.test.ts-snapshots/
             - name: Merge coverage
               run: cp jest-coverage/coverage-final.json .nyc_output/coverage_jsdom.json
-            - name: Coverage artifact
-              uses: actions/upload-artifact@v3
-              with:
-                name: coverage
-                path: .nyc_output
             - name: Codecov
               uses: codecov/codecov-action@v3
               with:

.github/workflows/size.yml

@@ -0,0 +1,24 @@
+name: Compressed Size
+on: [pull_request]
+
+jobs:
+    runner-job:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Check out repository code
+              uses: actions/checkout@v3
+            - name: Setup node
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+            - name: Install pnpm
+              run: npm install -g pnpm
+            - name: Install packages
+              run: pnpm install
+            - name: Check compressed size
+              uses: preactjs/compressed-size-action@v2
+              with:
+                  build-script: "production"
+                  pattern: "./lib/**/*.js"
+                  exclude: "{./lib/**/*.d.js,./lib/playwright/**,./lib/test/**}"

README.md

@@ -12,7 +12,7 @@ JqTree is a tree widget. Read more in the [documentation](https://mbraak.github.
 
 -   Create a tree from JSON data
 -   Drag and drop
--   Works on ie11+, firefox, chrome and safari
+-   Works on all modern browsers
 -   Written in Typescript
 
 The project is hosted on [github](https://github.com/mbraak/jqTree), has a [test suite](http://mbraak.github.io/jqTree/test/test.html).

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "jqTree",
-    "version": "1.7.1",
+    "version": "1.7.2",
     "main": [
         "jqtree.css",
         "jqtree-circle.png",

docs/Gemfile.lock

@@ -1,30 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+      zeitwerk (~> 2.3)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.9)
+    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
+    dnsruby (1.70.0)
+      simpleidn (~> 0.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
-    faraday (2.7.4)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
@@ -86,7 +87,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.3)
       addressable (~> 2.4)
@@ -205,13 +206,13 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.4)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.18.0)
-    nokogiri (1.14.3)
+    minitest (5.20.0)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.25.1)
@@ -220,11 +221,11 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.2)
+    racc (1.7.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (3.26.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -249,6 +250,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
@@ -257,4 +259,4 @@ DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   2.1.4
+   1.17.2

docs/_config.yml

@@ -18,7 +18,7 @@ defaults:
       values:
         layout: "example"
 
-jqtree_version: 1.7.1
+jqtree_version: 1.7.2
 
 # Build settings
 markdown: kramdown

docs/_entries/03_features.md

@@ -9,7 +9,7 @@ name: features
 -   Saves the state
 -   Keyboard support
 -   Lazy loading
--   Works on ie11+, firefox, chrome and safari
+-   Works on all modern browsers
 -   Written in Typescript
 
 The project is [hosted on github](https://github.com/mbraak/jqTree).

docs/_entries/10_changelog.md

@@ -3,6 +3,11 @@ title: Changelog
 name: changelog
 ---
 
+#### 1.7.2 (september 14 2023)
+
+-   Issue #732: improve types of closedIcon and openedIcon
+-   Issue #736: use the bundle in the package.json
+
 #### 1.7.1 (august 6 2023)
 
 -   Issue #724: improve accessibility

docs/_entries/16_closedicon.md

@@ -5,8 +5,22 @@ name: options-closedicon
 
 A character or symbol to display on closed nodes. The default is '►' (►)
 
+The value can be a:
+
+-   **string**. E.g. a unicode character or a text.
+    -   The text is escaped.
+-   **html element**. E.g. for an icon
+-   **JQuery element**. Also for an icon
+
 {% highlight js %}
-$('#tree1').tree({
-    closedIcon: '+'
-});
+// String
+$('#tree1').tree({ closedIcon: '+' });
+
+// Html element
+const icon = document.createElement("span");
+icon.className = "icon test";
+$('#tree1').tree({ closedIcon: icon });
+
+// JQuery element
+$('#tree1').tree({ closedIcon: $('<span class="icon test" />') });
 {% endhighlight %}

docs/_entries/31_openedicon.md

@@ -5,8 +5,22 @@ name: options-openedicon
 
 A character or symbol to display on opened nodes. The default is '▼' (▼)
 
+The value can be a:
+
+-   **string**. E.g. a unicode character or a text.
+    -   The text is escaped.
+-   **html element**. E.g. for an icon
+-   **JQuery element**. Also for an icon
+
 {% highlight js %}
-$('#tree1').tree({
-    openedIcon: '-'
-});
+// String
+$('#tree1').tree({ openedIcon: '-' });
+
+// Html element
+const icon = document.createElement("span");
+icon.className = "icon test";
+$('#tree1').tree({ openedIcon: icon });
+
+// JQuery element
+$('#tree1').tree({ openedIcon: $('<span class="icon test" />') });
 {% endhighlight %}

docs/package.json

@@ -11,8 +11,8 @@
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.9",
-    "autoprefixer": "^10.4.14",
-    "postcss": "^8.4.27",
+    "autoprefixer": "^10.4.15",
+    "postcss": "^8.4.28",
     "postcss-cli": "^10.1.0",
     "postcss-import": "^15.1.0",
     "postcss-load-config": "^4.0.1",