Skip to content

XWIKI-23719: The tree finder uses a hard-coded icon #5168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sereza7 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

XWIKI-23719: The tree finder uses a hard-coded icon #5168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
982011b
XWIKI-23719: The tree finder uses a hard-coded icon
Sereza7 Feb 10, 2026
60aef32
XWIKI-23719: The tree finder uses a hard-coded icon
Sereza7 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ngo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/javascript.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
'xwiki-locale-picker': $xwiki.getSkinFile('localePicker.js', true),
'xwiki-meta': $xwiki.getSkinFile('js/xwiki/meta.js'),
'xwiki-selectize': $xwiki.getSkinFile('uicomponents/suggest/xwiki.selectize.js'),
'xwiki-tree-finder': "#removeJsSuffix($services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', ""finder${jsExtension}""))",
'xwiki-tree-finder': "#removeJsSuffix($services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', ""finder${jsExtension}"", {'evaluate': true}))",
'xwiki-tree': "#removeJsSuffix($services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', ""tree${jsExtension}""))"
},
'shim': {
Expand Down
16 changes: 6 additions & 10 deletions ...i-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/finder.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
input[type="text"].xtree-finder {
background-image: url("$xwiki.getSkinFile('icons/xwiki/search.png')");
background-repeat: no-repeat;
margin: .5em 0;
width: 100%;
.xtree-finder-container {
display: flex;
gap: .5em;
align-items: center;
}

input[type="text"].xtree-finder,
input[type="text"].xtree-finder.loading {
background-position: 2px center;
padding-left: 20px;
padding-right: 20px;
input[type="text"].xtree-finder {
width: 100%;
}

div.suggestItems.xtree-finder-suggestions {
Expand Down
22 changes: 18 additions & 4 deletions xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/finder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,17 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
/*!
#set ($iconNames = ['search'])
#set ($icons = {})
#foreach ($name in $iconNames)
#set ($discard = $icons.put($name, $services.icon.renderHTML($name)))
#end
#[[*/
Copy link
Member

@mflorea mflorea Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer we use the REST API. See https://github.com/xwiki/xwiki-platform/blob/master/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/src/main/resources/js/attachment/move.js#L35 for an example. We're missing a utility on the client side to simplify this (if you have time to add it, it would be awesome), but I think it's still better than mixing Velocity with JavaScript.

// Start JavaScript-only code.
(function(icons) {
"use strict";
define(['jquery', 'jsTree', 'xwiki-events-bridge'], function($) {
'use strict';

// jsTree uses the underscore notation for its API, instead of camel case.
// jshint camelcase:false
Expand All @@ -38,7 +47,10 @@ define(['jquery', 'jsTree', 'xwiki-events-bridge'], function($) {
$.jstree.defaults.core.allow_reselect = true;

var createSuggestInput = function(options) {
var input = document.createElement('input');
let container = document.createElement('div');
container.classList.add('xtree-finder-container');
container.update(icons.search);
let input = document.createElement('input');
input.type = 'text';
input.className = 'xtree-finder';
input.placeholder = options.finder.placeholder;
Expand All @@ -61,8 +73,8 @@ define(['jquery', 'jsTree', 'xwiki-events-bridge'], function($) {
timeout: 0,
varname: 'query'
});

return input;
container.appendChild(input);
return container;
};

var findNode = function(event, data) {
Expand Down Expand Up @@ -120,3 +132,5 @@ define(['jquery', 'jsTree', 'xwiki-events-bridge'], function($) {
};
};
});
// End JavaScript-only code.
}).apply(']]#', $jsontool.serialize([$icons]));
3 changes: 2 additions & 1 deletion ...orm-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/webjar/require-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#end
#set ($paths = {
'jsTree': $services.webjars.url('jstree', "jstree${minified}"),
'xwiki-tree-finder': $services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', "finder${minified}"),
'xwiki-tree-finder': $services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', "finder${minified}",
{'evaluate': true}),
'tree': $services.webjars.url('org.xwiki.platform:xwiki-platform-tree-webjar', "tree${minified}")
})
#[[*/
Expand Down