@atlaskit/share 4.16.13 → 4.17.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.
- package/CHANGELOG.md +8 -0
- package/dist/cjs/components/UserPickerField.js +42 -11
- package/dist/cjs/components/analytics/analytics.js +1 -1
- package/dist/es2019/components/UserPickerField.js +22 -7
- package/dist/es2019/components/analytics/analytics.js +1 -1
- package/dist/esm/components/UserPickerField.js +42 -11
- package/dist/esm/components/analytics/analytics.js +1 -1
- package/dist/types/components/UserPickerField.d.ts +3 -3
- package/dist/types/types/UserPickerOptions.d.ts +13 -0
- package/dist/types-ts4.5/components/UserPickerField.d.ts +3 -3
- package/dist/types-ts4.5/types/UserPickerOptions.d.ts +13 -0
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/share
|
|
2
2
|
|
|
3
|
+
## 4.17.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#99095](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99095)
|
|
8
|
+
[`ffdabd2f2891`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ffdabd2f2891) -
|
|
9
|
+
Allow custom placeholder, required & label messages for the user picker
|
|
10
|
+
|
|
3
11
|
## 4.16.13
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.UserPickerFieldComponent = exports.UserPickerField = exports.REQUIRED = void 0;
|
|
9
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
12
|
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
@@ -59,7 +60,7 @@ var getNoOptionsMessage = function getNoOptionsMessage(isPublicLink, allowEmail,
|
|
|
59
60
|
})) : null;
|
|
60
61
|
};
|
|
61
62
|
};
|
|
62
|
-
var
|
|
63
|
+
var getPlaceHolderMessageDescriptorDefault = function getPlaceHolderMessageDescriptorDefault() {
|
|
63
64
|
var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
|
|
64
65
|
var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
|
|
65
66
|
var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -81,7 +82,7 @@ var getPlaceHolderMessageDescriptor = function getPlaceHolderMessageDescriptor()
|
|
|
81
82
|
};
|
|
82
83
|
return placeholderMessage[product];
|
|
83
84
|
};
|
|
84
|
-
var
|
|
85
|
+
var getLabelMessageDescriptorDefault = function getLabelMessageDescriptorDefault() {
|
|
85
86
|
var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
|
|
86
87
|
var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
|
|
87
88
|
var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -101,7 +102,7 @@ var getLabelMessageDescriptor = function getLabelMessageDescriptor() {
|
|
|
101
102
|
};
|
|
102
103
|
return labelMessage[product];
|
|
103
104
|
};
|
|
104
|
-
var
|
|
105
|
+
var getRequiredMessageDefault = function getRequiredMessageDefault() {
|
|
105
106
|
var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
|
|
106
107
|
var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
|
|
107
108
|
var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -220,11 +221,41 @@ var UserPickerFieldComponent = exports.UserPickerFieldComponent = /*#__PURE__*/f
|
|
|
220
221
|
userPickerOptions = _this$props3.userPickerOptions;
|
|
221
222
|
var smartUserPickerProps = this.getSmartUserPickerProps();
|
|
222
223
|
var allowEmail = (0, _utils.allowEmails)(config);
|
|
223
|
-
var requiredMessage = getRequiredMessage(product, allowEmail, isBrowseUsersDisabled);
|
|
224
224
|
var _ref2 = userPickerOptions !== null && userPickerOptions !== void 0 ? userPickerOptions : {},
|
|
225
225
|
header = _ref2.header,
|
|
226
226
|
noOptionsMessageHandler = _ref2.noOptionsMessageHandler,
|
|
227
|
-
onFocus = _ref2.onFocus
|
|
227
|
+
onFocus = _ref2.onFocus,
|
|
228
|
+
getLabelMessageCustom = _ref2.getLabelMessage,
|
|
229
|
+
getPlaceholderMessageCustom = _ref2.getPlaceholderMessage,
|
|
230
|
+
getRequiredMessageCustom = _ref2.getRequiredMessage;
|
|
231
|
+
var getRequiredMessage = function getRequiredMessage() {
|
|
232
|
+
var _getRequiredMessageCu;
|
|
233
|
+
for (var _len2 = arguments.length, _ref3 = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
|
234
|
+
_ref3[_key2] = arguments[_key2];
|
|
235
|
+
}
|
|
236
|
+
var product = _ref3[0],
|
|
237
|
+
params = _ref3.slice(1);
|
|
238
|
+
return (_getRequiredMessageCu = getRequiredMessageCustom === null || getRequiredMessageCustom === void 0 ? void 0 : getRequiredMessageCustom.apply(void 0, (0, _toConsumableArray2.default)(params))) !== null && _getRequiredMessageCu !== void 0 ? _getRequiredMessageCu : getRequiredMessageDefault.apply(void 0, [product].concat((0, _toConsumableArray2.default)(params)));
|
|
239
|
+
};
|
|
240
|
+
var getLabelMessage = function getLabelMessage() {
|
|
241
|
+
var _getLabelMessageCusto;
|
|
242
|
+
for (var _len3 = arguments.length, _ref4 = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
|
|
243
|
+
_ref4[_key3] = arguments[_key3];
|
|
244
|
+
}
|
|
245
|
+
var product = _ref4[0],
|
|
246
|
+
params = _ref4.slice(1);
|
|
247
|
+
return (_getLabelMessageCusto = getLabelMessageCustom === null || getLabelMessageCustom === void 0 ? void 0 : getLabelMessageCustom.apply(void 0, (0, _toConsumableArray2.default)(params))) !== null && _getLabelMessageCusto !== void 0 ? _getLabelMessageCusto : getLabelMessageDescriptorDefault.apply(void 0, [product].concat((0, _toConsumableArray2.default)(params)));
|
|
248
|
+
};
|
|
249
|
+
var getPlaceHolderMessage = function getPlaceHolderMessage() {
|
|
250
|
+
var _getPlaceholderMessag;
|
|
251
|
+
for (var _len4 = arguments.length, _ref5 = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
|
|
252
|
+
_ref5[_key4] = arguments[_key4];
|
|
253
|
+
}
|
|
254
|
+
var product = _ref5[0],
|
|
255
|
+
params = _ref5.slice(1);
|
|
256
|
+
return (_getPlaceholderMessag = getPlaceholderMessageCustom === null || getPlaceholderMessageCustom === void 0 ? void 0 : getPlaceholderMessageCustom.apply(void 0, (0, _toConsumableArray2.default)(params))) !== null && _getPlaceholderMessag !== void 0 ? _getPlaceholderMessag : getPlaceHolderMessageDescriptorDefault.apply(void 0, [product].concat((0, _toConsumableArray2.default)(params)));
|
|
257
|
+
};
|
|
258
|
+
var requiredMessage = getRequiredMessage(product, allowEmail, isBrowseUsersDisabled);
|
|
228
259
|
var commonPickerProps = {
|
|
229
260
|
fieldId: 'share',
|
|
230
261
|
loadOptions: this.loadOptions,
|
|
@@ -244,16 +275,16 @@ var UserPickerFieldComponent = exports.UserPickerFieldComponent = /*#__PURE__*/f
|
|
|
244
275
|
return /*#__PURE__*/_react.default.createElement(_form.Field, {
|
|
245
276
|
label: /*#__PURE__*/_react.default.createElement("span", {
|
|
246
277
|
id: USER_PICKER_FIELD_LABEL
|
|
247
|
-
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage,
|
|
278
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, getLabelMessage(product, allowEmail, isBrowseUsersDisabled))),
|
|
248
279
|
name: "users",
|
|
249
280
|
validate: validate,
|
|
250
281
|
defaultValue: defaultValue,
|
|
251
282
|
transform: this.handleUserPickerTransform,
|
|
252
283
|
isRequired: true
|
|
253
|
-
}, function (
|
|
254
|
-
var fieldProps =
|
|
255
|
-
fieldValidationError =
|
|
256
|
-
fieldValid =
|
|
284
|
+
}, function (_ref6) {
|
|
285
|
+
var fieldProps = _ref6.fieldProps,
|
|
286
|
+
fieldValidationError = _ref6.error,
|
|
287
|
+
fieldValid = _ref6.meta.valid;
|
|
257
288
|
var helperMessage = _this2.getHelperMessageOrDefault();
|
|
258
289
|
var addMoreMessage = shareError !== null && shareError !== void 0 && shareError.errorCode ? null : intl.formatMessage(_i18n.messages.userPickerAddMoreMessage);
|
|
259
290
|
var wasValidationOrShareError = !!fieldValidationError || !!shareError;
|
|
@@ -263,7 +294,7 @@ var UserPickerFieldComponent = exports.UserPickerFieldComponent = /*#__PURE__*/f
|
|
|
263
294
|
addMoreMessage: addMoreMessage,
|
|
264
295
|
placeholder: /*#__PURE__*/_react.default.createElement("span", {
|
|
265
296
|
id: USER_PICKER_FIELD_PLACEHOLDER
|
|
266
|
-
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage,
|
|
297
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, getPlaceHolderMessage(product, allowEmail, isBrowseUsersDisabled))),
|
|
267
298
|
menuPortalTarget: menuPortalTarget,
|
|
268
299
|
inputId: fieldProps.id
|
|
269
300
|
})), helperMessage && !wasValidationOrShareError && /*#__PURE__*/_react.default.createElement(_form.HelperMessage, null, helperMessage), !fieldValid && fieldValidationError === REQUIRED && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, requiredMessage)), shareError && shareError.errorCode && /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, null, shareError.message, "\xA0", shareError.helpUrl && /*#__PURE__*/_react.default.createElement("a", {
|
|
@@ -13,7 +13,7 @@ var buildAttributes = function buildAttributes() {
|
|
|
13
13
|
var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
14
14
|
return _objectSpread({
|
|
15
15
|
packageName: "@atlaskit/share",
|
|
16
|
-
packageVersion: "4.
|
|
16
|
+
packageVersion: "4.17.0"
|
|
17
17
|
}, attributes);
|
|
18
18
|
};
|
|
19
19
|
var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {
|
|
@@ -38,7 +38,7 @@ const getNoOptionsMessage = (isPublicLink, allowEmail, noOptionsMessageHandler)
|
|
|
38
38
|
}
|
|
39
39
|
})) : null;
|
|
40
40
|
};
|
|
41
|
-
const
|
|
41
|
+
const getPlaceHolderMessageDescriptorDefault = (product = 'confluence', allowEmail, isBrowseUsersDisabled) => {
|
|
42
42
|
if (!allowEmail) {
|
|
43
43
|
const placeholderMessage = {
|
|
44
44
|
jira: messages.userPickerPlaceholderEmailDisabledJira,
|
|
@@ -57,7 +57,7 @@ const getPlaceHolderMessageDescriptor = (product = 'confluence', allowEmail, isB
|
|
|
57
57
|
};
|
|
58
58
|
return placeholderMessage[product];
|
|
59
59
|
};
|
|
60
|
-
const
|
|
60
|
+
const getLabelMessageDescriptorDefault = (product = 'confluence', allowEmail, isBrowseUsersDisabled) => {
|
|
61
61
|
if (!allowEmail) {
|
|
62
62
|
const labelMessage = {
|
|
63
63
|
jira: messages.userPickerLabelEmailDisabledJira,
|
|
@@ -74,7 +74,7 @@ const getLabelMessageDescriptor = (product = 'confluence', allowEmail, isBrowseU
|
|
|
74
74
|
};
|
|
75
75
|
return labelMessage[product];
|
|
76
76
|
};
|
|
77
|
-
const
|
|
77
|
+
const getRequiredMessageDefault = (product = 'confluence', allowEmail, isBrowseUsersDisabled) => {
|
|
78
78
|
if (!allowEmail) {
|
|
79
79
|
const requiredMessage = {
|
|
80
80
|
jira: messages.userPickerRequiredMessageEmailDisabledJira,
|
|
@@ -185,12 +185,27 @@ export class UserPickerFieldComponent extends React.Component {
|
|
|
185
185
|
} = this.props;
|
|
186
186
|
const smartUserPickerProps = this.getSmartUserPickerProps();
|
|
187
187
|
const allowEmail = allowEmails(config);
|
|
188
|
-
const requiredMessage = getRequiredMessage(product, allowEmail, isBrowseUsersDisabled);
|
|
189
188
|
const {
|
|
190
189
|
header,
|
|
191
190
|
noOptionsMessageHandler,
|
|
192
|
-
onFocus
|
|
191
|
+
onFocus,
|
|
192
|
+
getLabelMessage: getLabelMessageCustom,
|
|
193
|
+
getPlaceholderMessage: getPlaceholderMessageCustom,
|
|
194
|
+
getRequiredMessage: getRequiredMessageCustom
|
|
193
195
|
} = userPickerOptions !== null && userPickerOptions !== void 0 ? userPickerOptions : {};
|
|
196
|
+
const getRequiredMessage = (...[product, ...params]) => {
|
|
197
|
+
var _getRequiredMessageCu;
|
|
198
|
+
return (_getRequiredMessageCu = getRequiredMessageCustom === null || getRequiredMessageCustom === void 0 ? void 0 : getRequiredMessageCustom(...params)) !== null && _getRequiredMessageCu !== void 0 ? _getRequiredMessageCu : getRequiredMessageDefault(...[product, ...params]);
|
|
199
|
+
};
|
|
200
|
+
const getLabelMessage = (...[product, ...params]) => {
|
|
201
|
+
var _getLabelMessageCusto;
|
|
202
|
+
return (_getLabelMessageCusto = getLabelMessageCustom === null || getLabelMessageCustom === void 0 ? void 0 : getLabelMessageCustom(...params)) !== null && _getLabelMessageCusto !== void 0 ? _getLabelMessageCusto : getLabelMessageDescriptorDefault(...[product, ...params]);
|
|
203
|
+
};
|
|
204
|
+
const getPlaceHolderMessage = (...[product, ...params]) => {
|
|
205
|
+
var _getPlaceholderMessag;
|
|
206
|
+
return (_getPlaceholderMessag = getPlaceholderMessageCustom === null || getPlaceholderMessageCustom === void 0 ? void 0 : getPlaceholderMessageCustom(...params)) !== null && _getPlaceholderMessag !== void 0 ? _getPlaceholderMessag : getPlaceHolderMessageDescriptorDefault(...[product, ...params]);
|
|
207
|
+
};
|
|
208
|
+
const requiredMessage = getRequiredMessage(product, allowEmail, isBrowseUsersDisabled);
|
|
194
209
|
const commonPickerProps = {
|
|
195
210
|
fieldId: 'share',
|
|
196
211
|
loadOptions: this.loadOptions,
|
|
@@ -210,7 +225,7 @@ export class UserPickerFieldComponent extends React.Component {
|
|
|
210
225
|
return /*#__PURE__*/React.createElement(Field, {
|
|
211
226
|
label: /*#__PURE__*/React.createElement("span", {
|
|
212
227
|
id: USER_PICKER_FIELD_LABEL
|
|
213
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage,
|
|
228
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, getLabelMessage(product, allowEmail, isBrowseUsersDisabled))),
|
|
214
229
|
name: "users",
|
|
215
230
|
validate: validate,
|
|
216
231
|
defaultValue: defaultValue,
|
|
@@ -232,7 +247,7 @@ export class UserPickerFieldComponent extends React.Component {
|
|
|
232
247
|
addMoreMessage: addMoreMessage,
|
|
233
248
|
placeholder: /*#__PURE__*/React.createElement("span", {
|
|
234
249
|
id: USER_PICKER_FIELD_PLACEHOLDER
|
|
235
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage,
|
|
250
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, getPlaceHolderMessage(product, allowEmail, isBrowseUsersDisabled))),
|
|
236
251
|
menuPortalTarget: menuPortalTarget,
|
|
237
252
|
inputId: fieldProps.id
|
|
238
253
|
})), helperMessage && !wasValidationOrShareError && /*#__PURE__*/React.createElement(HelperMessage, null, helperMessage), !fieldValid && fieldValidationError === REQUIRED && /*#__PURE__*/React.createElement(ErrorMessage, null, /*#__PURE__*/React.createElement(FormattedMessage, requiredMessage)), shareError && shareError.errorCode && /*#__PURE__*/React.createElement(ErrorMessage, null, shareError.message, "\xA0", shareError.helpUrl && /*#__PURE__*/React.createElement("a", {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isEmail, isExternalUser, isTeam, isUser } from '@atlaskit/smart-user-picker';
|
|
2
2
|
const buildAttributes = (attributes = {}) => ({
|
|
3
3
|
packageName: "@atlaskit/share",
|
|
4
|
-
packageVersion: "4.
|
|
4
|
+
packageVersion: "4.17.0",
|
|
5
5
|
...attributes
|
|
6
6
|
});
|
|
7
7
|
const createEvent = (eventType, source, action, actionSubject, actionSubjectId, attributes = {}) => ({
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
1
2
|
import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
|
|
2
3
|
import _createClass from "@babel/runtime/helpers/createClass";
|
|
3
4
|
import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
|
|
@@ -49,7 +50,7 @@ var getNoOptionsMessage = function getNoOptionsMessage(isPublicLink, allowEmail,
|
|
|
49
50
|
})) : null;
|
|
50
51
|
};
|
|
51
52
|
};
|
|
52
|
-
var
|
|
53
|
+
var getPlaceHolderMessageDescriptorDefault = function getPlaceHolderMessageDescriptorDefault() {
|
|
53
54
|
var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
|
|
54
55
|
var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
|
|
55
56
|
var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -71,7 +72,7 @@ var getPlaceHolderMessageDescriptor = function getPlaceHolderMessageDescriptor()
|
|
|
71
72
|
};
|
|
72
73
|
return placeholderMessage[product];
|
|
73
74
|
};
|
|
74
|
-
var
|
|
75
|
+
var getLabelMessageDescriptorDefault = function getLabelMessageDescriptorDefault() {
|
|
75
76
|
var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
|
|
76
77
|
var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
|
|
77
78
|
var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -91,7 +92,7 @@ var getLabelMessageDescriptor = function getLabelMessageDescriptor() {
|
|
|
91
92
|
};
|
|
92
93
|
return labelMessage[product];
|
|
93
94
|
};
|
|
94
|
-
var
|
|
95
|
+
var getRequiredMessageDefault = function getRequiredMessageDefault() {
|
|
95
96
|
var product = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'confluence';
|
|
96
97
|
var allowEmail = arguments.length > 1 ? arguments[1] : undefined;
|
|
97
98
|
var isBrowseUsersDisabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -210,11 +211,41 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
210
211
|
userPickerOptions = _this$props3.userPickerOptions;
|
|
211
212
|
var smartUserPickerProps = this.getSmartUserPickerProps();
|
|
212
213
|
var allowEmail = allowEmails(config);
|
|
213
|
-
var requiredMessage = getRequiredMessage(product, allowEmail, isBrowseUsersDisabled);
|
|
214
214
|
var _ref2 = userPickerOptions !== null && userPickerOptions !== void 0 ? userPickerOptions : {},
|
|
215
215
|
header = _ref2.header,
|
|
216
216
|
noOptionsMessageHandler = _ref2.noOptionsMessageHandler,
|
|
217
|
-
onFocus = _ref2.onFocus
|
|
217
|
+
onFocus = _ref2.onFocus,
|
|
218
|
+
getLabelMessageCustom = _ref2.getLabelMessage,
|
|
219
|
+
getPlaceholderMessageCustom = _ref2.getPlaceholderMessage,
|
|
220
|
+
getRequiredMessageCustom = _ref2.getRequiredMessage;
|
|
221
|
+
var getRequiredMessage = function getRequiredMessage() {
|
|
222
|
+
var _getRequiredMessageCu;
|
|
223
|
+
for (var _len2 = arguments.length, _ref3 = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
|
224
|
+
_ref3[_key2] = arguments[_key2];
|
|
225
|
+
}
|
|
226
|
+
var product = _ref3[0],
|
|
227
|
+
params = _ref3.slice(1);
|
|
228
|
+
return (_getRequiredMessageCu = getRequiredMessageCustom === null || getRequiredMessageCustom === void 0 ? void 0 : getRequiredMessageCustom.apply(void 0, _toConsumableArray(params))) !== null && _getRequiredMessageCu !== void 0 ? _getRequiredMessageCu : getRequiredMessageDefault.apply(void 0, [product].concat(_toConsumableArray(params)));
|
|
229
|
+
};
|
|
230
|
+
var getLabelMessage = function getLabelMessage() {
|
|
231
|
+
var _getLabelMessageCusto;
|
|
232
|
+
for (var _len3 = arguments.length, _ref4 = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
|
|
233
|
+
_ref4[_key3] = arguments[_key3];
|
|
234
|
+
}
|
|
235
|
+
var product = _ref4[0],
|
|
236
|
+
params = _ref4.slice(1);
|
|
237
|
+
return (_getLabelMessageCusto = getLabelMessageCustom === null || getLabelMessageCustom === void 0 ? void 0 : getLabelMessageCustom.apply(void 0, _toConsumableArray(params))) !== null && _getLabelMessageCusto !== void 0 ? _getLabelMessageCusto : getLabelMessageDescriptorDefault.apply(void 0, [product].concat(_toConsumableArray(params)));
|
|
238
|
+
};
|
|
239
|
+
var getPlaceHolderMessage = function getPlaceHolderMessage() {
|
|
240
|
+
var _getPlaceholderMessag;
|
|
241
|
+
for (var _len4 = arguments.length, _ref5 = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
|
|
242
|
+
_ref5[_key4] = arguments[_key4];
|
|
243
|
+
}
|
|
244
|
+
var product = _ref5[0],
|
|
245
|
+
params = _ref5.slice(1);
|
|
246
|
+
return (_getPlaceholderMessag = getPlaceholderMessageCustom === null || getPlaceholderMessageCustom === void 0 ? void 0 : getPlaceholderMessageCustom.apply(void 0, _toConsumableArray(params))) !== null && _getPlaceholderMessag !== void 0 ? _getPlaceholderMessag : getPlaceHolderMessageDescriptorDefault.apply(void 0, [product].concat(_toConsumableArray(params)));
|
|
247
|
+
};
|
|
248
|
+
var requiredMessage = getRequiredMessage(product, allowEmail, isBrowseUsersDisabled);
|
|
218
249
|
var commonPickerProps = {
|
|
219
250
|
fieldId: 'share',
|
|
220
251
|
loadOptions: this.loadOptions,
|
|
@@ -234,16 +265,16 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
234
265
|
return /*#__PURE__*/React.createElement(Field, {
|
|
235
266
|
label: /*#__PURE__*/React.createElement("span", {
|
|
236
267
|
id: USER_PICKER_FIELD_LABEL
|
|
237
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage,
|
|
268
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, getLabelMessage(product, allowEmail, isBrowseUsersDisabled))),
|
|
238
269
|
name: "users",
|
|
239
270
|
validate: validate,
|
|
240
271
|
defaultValue: defaultValue,
|
|
241
272
|
transform: this.handleUserPickerTransform,
|
|
242
273
|
isRequired: true
|
|
243
|
-
}, function (
|
|
244
|
-
var fieldProps =
|
|
245
|
-
fieldValidationError =
|
|
246
|
-
fieldValid =
|
|
274
|
+
}, function (_ref6) {
|
|
275
|
+
var fieldProps = _ref6.fieldProps,
|
|
276
|
+
fieldValidationError = _ref6.error,
|
|
277
|
+
fieldValid = _ref6.meta.valid;
|
|
247
278
|
var helperMessage = _this2.getHelperMessageOrDefault();
|
|
248
279
|
var addMoreMessage = shareError !== null && shareError !== void 0 && shareError.errorCode ? null : intl.formatMessage(messages.userPickerAddMoreMessage);
|
|
249
280
|
var wasValidationOrShareError = !!fieldValidationError || !!shareError;
|
|
@@ -253,7 +284,7 @@ export var UserPickerFieldComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
253
284
|
addMoreMessage: addMoreMessage,
|
|
254
285
|
placeholder: /*#__PURE__*/React.createElement("span", {
|
|
255
286
|
id: USER_PICKER_FIELD_PLACEHOLDER
|
|
256
|
-
}, /*#__PURE__*/React.createElement(FormattedMessage,
|
|
287
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, getPlaceHolderMessage(product, allowEmail, isBrowseUsersDisabled))),
|
|
257
288
|
menuPortalTarget: menuPortalTarget,
|
|
258
289
|
inputId: fieldProps.id
|
|
259
290
|
})), helperMessage && !wasValidationOrShareError && /*#__PURE__*/React.createElement(HelperMessage, null, helperMessage), !fieldValid && fieldValidationError === REQUIRED && /*#__PURE__*/React.createElement(ErrorMessage, null, /*#__PURE__*/React.createElement(FormattedMessage, requiredMessage)), shareError && shareError.errorCode && /*#__PURE__*/React.createElement(ErrorMessage, null, shareError.message, "\xA0", shareError.helpUrl && /*#__PURE__*/React.createElement("a", {
|
|
@@ -6,7 +6,7 @@ var buildAttributes = function buildAttributes() {
|
|
|
6
6
|
var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
7
7
|
return _objectSpread({
|
|
8
8
|
packageName: "@atlaskit/share",
|
|
9
|
-
packageVersion: "4.
|
|
9
|
+
packageVersion: "4.17.0"
|
|
10
10
|
}, attributes);
|
|
11
11
|
};
|
|
12
12
|
var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { WrappedComponentProps } from 'react-intl-next';
|
|
3
|
-
import { LoadOptions, OptionData, Value } from '@atlaskit/smart-user-picker';
|
|
4
|
-
import { ConfigResponse, ProductName, ShareError, UserPickerOptions } from '../types';
|
|
2
|
+
import { type WrappedComponentProps } from 'react-intl-next';
|
|
3
|
+
import { type LoadOptions, type OptionData, type Value } from '@atlaskit/smart-user-picker';
|
|
4
|
+
import { type ConfigResponse, type ProductName, type ShareError, type UserPickerOptions } from '../types';
|
|
5
5
|
export declare const REQUIRED = "REQUIRED";
|
|
6
6
|
export type Props = {
|
|
7
7
|
loadOptions?: LoadOptions;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
+
import { type MessageDescriptor } from 'react-intl-next';
|
|
2
3
|
import type { Props as SmartUserPickerProps } from '@atlaskit/smart-user-picker';
|
|
3
4
|
export type UserPickerOptions = Pick<SmartUserPickerProps, 'onFocus' | 'header' | 'includeNonLicensedUsers'> & {
|
|
4
5
|
/** Message to be shown when the menu is open but no options are provided.
|
|
@@ -10,4 +11,16 @@ export type UserPickerOptions = Pick<SmartUserPickerProps, 'onFocus' | 'header'
|
|
|
10
11
|
isPublicLink?: boolean;
|
|
11
12
|
allowEmail?: boolean;
|
|
12
13
|
}) => string | null | React.ReactNode) | null;
|
|
14
|
+
/**
|
|
15
|
+
* Placeholder message for the user picker.
|
|
16
|
+
*/
|
|
17
|
+
getPlaceholderMessage?: (allowEmail?: boolean, isBrowseUsersDisabled?: boolean) => MessageDescriptor;
|
|
18
|
+
/**
|
|
19
|
+
* Label message for the user picker.
|
|
20
|
+
*/
|
|
21
|
+
getLabelMessage?: (allowEmail?: boolean, isBrowseUsersDisabled?: boolean) => MessageDescriptor;
|
|
22
|
+
/**
|
|
23
|
+
* Message to be shown when required validation is shown in the user picker.
|
|
24
|
+
*/
|
|
25
|
+
getRequiredMessage?: (allowEmail?: boolean, isBrowseUsersDisabled?: boolean) => MessageDescriptor;
|
|
13
26
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { WrappedComponentProps } from 'react-intl-next';
|
|
3
|
-
import { LoadOptions, OptionData, Value } from '@atlaskit/smart-user-picker';
|
|
4
|
-
import { ConfigResponse, ProductName, ShareError, UserPickerOptions } from '../types';
|
|
2
|
+
import { type WrappedComponentProps } from 'react-intl-next';
|
|
3
|
+
import { type LoadOptions, type OptionData, type Value } from '@atlaskit/smart-user-picker';
|
|
4
|
+
import { type ConfigResponse, type ProductName, type ShareError, type UserPickerOptions } from '../types';
|
|
5
5
|
export declare const REQUIRED = "REQUIRED";
|
|
6
6
|
export type Props = {
|
|
7
7
|
loadOptions?: LoadOptions;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
+
import { type MessageDescriptor } from 'react-intl-next';
|
|
2
3
|
import type { Props as SmartUserPickerProps } from '@atlaskit/smart-user-picker';
|
|
3
4
|
export type UserPickerOptions = Pick<SmartUserPickerProps, 'onFocus' | 'header' | 'includeNonLicensedUsers'> & {
|
|
4
5
|
/** Message to be shown when the menu is open but no options are provided.
|
|
@@ -10,4 +11,16 @@ export type UserPickerOptions = Pick<SmartUserPickerProps, 'onFocus' | 'header'
|
|
|
10
11
|
isPublicLink?: boolean;
|
|
11
12
|
allowEmail?: boolean;
|
|
12
13
|
}) => string | null | React.ReactNode) | null;
|
|
14
|
+
/**
|
|
15
|
+
* Placeholder message for the user picker.
|
|
16
|
+
*/
|
|
17
|
+
getPlaceholderMessage?: (allowEmail?: boolean, isBrowseUsersDisabled?: boolean) => MessageDescriptor;
|
|
18
|
+
/**
|
|
19
|
+
* Label message for the user picker.
|
|
20
|
+
*/
|
|
21
|
+
getLabelMessage?: (allowEmail?: boolean, isBrowseUsersDisabled?: boolean) => MessageDescriptor;
|
|
22
|
+
/**
|
|
23
|
+
* Message to be shown when required validation is shown in the user picker.
|
|
24
|
+
*/
|
|
25
|
+
getRequiredMessage?: (allowEmail?: boolean, isBrowseUsersDisabled?: boolean) => MessageDescriptor;
|
|
13
26
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/share",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.17.0",
|
|
4
4
|
"description": "Fabric Share Element",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@atlaskit/tabs": "^16.1.0",
|
|
55
55
|
"@atlaskit/textarea": "^5.4.0",
|
|
56
56
|
"@atlaskit/theme": "^12.8.0",
|
|
57
|
-
"@atlaskit/tokens": "^1.
|
|
57
|
+
"@atlaskit/tokens": "^1.48.0",
|
|
58
58
|
"@atlaskit/tooltip": "^18.3.0",
|
|
59
59
|
"@atlaskit/ufo": "^0.2.0",
|
|
60
60
|
"@atlaskit/user-picker": "^10.20.0",
|