@formixru/b2b-ui 2.2.0 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/package.json +1 -1
  3. package/src/components/request/index.js +21 -8
package/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## v2.3.0
2
+
3
+ - В `Request` добавлена поддержка id диалогового окна или сайдбара как c `#`, так и без неё
4
+
1
5
  ## v2.2.0
2
6
 
3
7
  - Доработки по стилям `.tabs`/`.warning-message`
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@formixru/b2b-ui",
3
- "version": "2.2.0",
3
+ "version": "2.3.0",
4
4
  "type": "module",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/request/index.js CHANGED
@@ -15,6 +15,13 @@ export const initRequestContent = ($b) => {
15
15
  }
16
16
  };
17
17
 
18
+ const getElementId = (id) => {
19
+ if (!id || id.startsWith('#')) {
20
+ return id;
21
+ }
22
+ return `#${id}`;
23
+ };
24
+
18
25
  export const request = async ({
19
26
  $b,
20
27
  url = '',
@@ -90,18 +97,20 @@ export const request = async ({
90
97
  console.warn('Функция __FORMIX__REQUEST__INTERCEPT_DATA не установлена');
91
98
  }
92
99
  if (data.dialog) {
93
- const $dialog = document.querySelector(data.dialog.id);
100
+ const elementId = getElementId(data.dialog.id);
101
+ const $dialog = document.querySelector(elementId);
94
102
  if ($dialog) {
95
103
  $dialog.querySelector('.dialog__container').innerHTML = data.dialog.content;
96
104
  await showDialog($dialog);
97
105
  initRequestContent($dialog);
98
106
  } else {
99
- console.error(`Диалоговое окно с id ${data.trigger} не найдено`);
107
+ console.error(`Диалоговое окно с id ${elementId?.replace(/^#/, '')} не найдено`);
100
108
  }
101
109
  }
102
110
  if (data.reloadOnHideDialog) {
103
111
  if (data.dialog) {
104
- const $dialog = document.querySelector(data.dialog.id);
112
+ const elementId = getElementId(data.dialog.id);
113
+ const $dialog = document.querySelector(elementId);
105
114
  $dialog?.addEventListener('dialog-hide', () => {
106
115
  location.reload();
107
116
  });
@@ -113,7 +122,8 @@ export const request = async ({
113
122
  }
114
123
  if (data.hideDialog) {
115
124
  if (data.dialog) {
116
- const $dialog = document.querySelector(data.dialog.id);
125
+ const elementId = getElementId(data.dialog.id);
126
+ const $dialog = document.querySelector(elementId);
117
127
  if ($dialog) {
118
128
  hideDialog($dialog);
119
129
  }
@@ -122,18 +132,20 @@ export const request = async ({
122
132
  }
123
133
  }
124
134
  if (data.sidebar) {
125
- const $sidebar = document.querySelector(data.sidebar.id);
135
+ const elementId = getElementId(data.sidebar.id);
136
+ const $sidebar = document.querySelector(elementId);
126
137
  if ($sidebar) {
127
138
  $sidebar.innerHTML = data.sidebar.content;
128
139
  await showSidebar($sidebar);
129
140
  initRequestContent($sidebar);
130
141
  } else {
131
- console.error(`Сайдбар с id ${data.trigger} не найден`);
142
+ console.error(`Сайдбар с id ${elementId?.replace(/^#/, '')} не найден`);
132
143
  }
133
144
  }
134
145
  if (data.reloadOnHideSidebar) {
135
146
  if (data.sidebar) {
136
- const $sidebar = document.querySelector(data.sidebar.id);
147
+ const elementId = getElementId(data.sidebar.id);
148
+ const $sidebar = document.querySelector(elementId);
137
149
  $sidebar?.addEventListener('sidebar-hide', () => {
138
150
  location.reload();
139
151
  });
@@ -145,7 +157,8 @@ export const request = async ({
145
157
  }
146
158
  if (data.hideSidebar) {
147
159
  if (data.sidebar) {
148
- const $sidebar = document.querySelector(data.sidebar.id);
160
+ const elementId = getElementId(data.sidebar.id);
161
+ const $sidebar = document.querySelector(elementId);
149
162
  if ($sidebar) {
150
163
  hideSidebar($sidebar);
151
164
  }