Skip to content

Commit 420e0e7

Browse files
ivansfdcivansfdc
committed
Merge pull request #63 from synle/sle/form-select-option-object
Allow SLDSPicklist to return option object instead of option.value
2 parents 8cbfe23 + c089860 commit 420e0e7

File tree

17 files changed

+53
-51
lines changed

17 files changed

+53
-51
lines changed

‎components/SLDSPicklistBase/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ module.exports = React.createClass( {
8383
getValueByIndex(index){
8484
const option = this.props.options[index];
8585
if(option){
86-
return this.props.options[index].value;
86+
return this.props.options[index];
8787
}
8888
},
8989

‎dist/design-system-react.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ return /******/ (function(modules) { // webpackBootstrap
242242
getValueByIndex: function getValueByIndex(index) {
243243
var option = this.props.options[index];
244244
if (option) {
245-
return this.props.options[index].value;
245+
return this.props.options[index];
246246
}
247247
},
248248

@@ -3163,11 +3163,12 @@ return /******/ (function(modules) { // webpackBootstrap
31633163

31643164
return {
31653165
componentDidMount: function() {
3166-
if(!this.handleClickOutside)
3166+
if(typeof this.handleClickOutside !== "function")
31673167
throw new Error("Component lacks a handleClickOutside(event) function for processing outside click events.");
31683168

31693169
var fn = this.__outsideClickHandler = (function(localNode, eventHandler) {
31703170
return function(evt) {
3171+
evt.stopPropagation();
31713172
var source = evt.target;
31723173
var found = false;
31733174
// If source=local then this event came from "somewhere"
@@ -3222,7 +3223,7 @@ return /******/ (function(modules) { // webpackBootstrap
32223223
* Can be called to explicitly disable event listening
32233224
* for clicks and touches outside of this element.
32243225
*/
3225-
disableOnClickOutside: function(fn) {
3226+
disableOnClickOutside: function() {
32263227
var fn = this.__outsideClickHandler;
32273228
document.removeEventListener("mousedown", fn);
32283229
document.removeEventListener("touchstart", fn);
@@ -7398,11 +7399,11 @@ return /******/ (function(modules) { // webpackBootstrap
73987399
var _again = true;_function: while (_again) {
73997400
var object = _x,
74007401
property = _x2,
7401-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
7402+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
74027403
var parent = Object.getPrototypeOf(object);if (parent === null) {
74037404
return undefined;
74047405
} else {
7405-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
7406+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
74067407
}
74077408
} else if ("value" in desc) {
74087409
return desc.value;
@@ -9338,12 +9339,14 @@ return /******/ (function(modules) { // webpackBootstrap
93389339
Licensed under the MIT License (MIT), see
93399340
http://jedwatson.github.io/classnames
93409341
*/
9342+
/* global define */
93419343

93429344
(function () {
93439345
'use strict';
93449346

9345-
function classNames () {
9347+
var hasOwn = {}.hasOwnProperty;
93469348

9349+
function classNames () {
93479350
var classes = '';
93489351

93499352
for (var i = 0; i < arguments.length; i++) {
@@ -9352,15 +9355,13 @@ return /******/ (function(modules) { // webpackBootstrap
93529355

93539356
var argType = typeof arg;
93549357

9355-
if ('string' === argType || 'number' === argType) {
9358+
if (argType === 'string' || argType === 'number') {
93569359
classes += ' ' + arg;
9357-
93589360
} else if (Array.isArray(arg)) {
93599361
classes += ' ' + classNames.apply(null, arg);
9360-
9361-
} else if ('object' === argType) {
9362+
} else if (argType === 'object') {
93629363
for (var key in arg) {
9363-
if (arg.hasOwnProperty(key) && arg[key]) {
9364+
if (hasOwn.call(arg, key) && arg[key]) {
93649365
classes += ' ' + key;
93659366
}
93669367
}
@@ -9372,15 +9373,14 @@ return /******/ (function(modules) { // webpackBootstrap
93729373

93739374
if (typeof module !== 'undefined' && module.exports) {
93749375
module.exports = classNames;
9375-
} else if (true){
9376-
// AMD. Register as an anonymous module.
9376+
} else if (true) {
9377+
// register as 'classnames', consistent with npm package name
93779378
!(__WEBPACK_AMD_DEFINE_RESULT__ = function () {
93789379
return classNames;
93799380
}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
93809381
} else {
93819382
window.classNames = classNames;
93829383
}
9383-
93849384
}());
93859385

93869386

@@ -9415,11 +9415,11 @@ return /******/ (function(modules) { // webpackBootstrap
94159415
var _again = true;_function: while (_again) {
94169416
var object = _x,
94179417
property = _x2,
9418-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
9418+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
94199419
var parent = Object.getPrototypeOf(object);if (parent === null) {
94209420
return undefined;
94219421
} else {
9422-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
9422+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
94239423
}
94249424
} else if ("value" in desc) {
94259425
return desc.value;
@@ -9512,11 +9512,11 @@ return /******/ (function(modules) { // webpackBootstrap
95129512
var _again = true;_function: while (_again) {
95139513
var object = _x,
95149514
property = _x2,
9515-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
9515+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
95169516
var parent = Object.getPrototypeOf(object);if (parent === null) {
95179517
return undefined;
95189518
} else {
9519-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
9519+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
95209520
}
95219521
} else if ("value" in desc) {
95229522
return desc.value;
@@ -10015,11 +10015,11 @@ return /******/ (function(modules) { // webpackBootstrap
1001510015
var _again = true;_function: while (_again) {
1001610016
var object = _x,
1001710017
property = _x2,
10018-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
10018+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
1001910019
var parent = Object.getPrototypeOf(object);if (parent === null) {
1002010020
return undefined;
1002110021
} else {
10022-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
10022+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
1002310023
}
1002410024
} else if ('value' in desc) {
1002510025
return desc.value;
@@ -10234,11 +10234,11 @@ return /******/ (function(modules) { // webpackBootstrap
1023410234
var _again = true;_function: while (_again) {
1023510235
var object = _x,
1023610236
property = _x2,
10237-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
10237+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
1023810238
var parent = Object.getPrototypeOf(object);if (parent === null) {
1023910239
return undefined;
1024010240
} else {
10241-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
10241+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
1024210242
}
1024310243
} else if ('value' in desc) {
1024410244
return desc.value;
@@ -10521,11 +10521,11 @@ return /******/ (function(modules) { // webpackBootstrap
1052110521
var _again = true;_function: while (_again) {
1052210522
var object = _x,
1052310523
property = _x2,
10524-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
10524+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
1052510525
var parent = Object.getPrototypeOf(object);if (parent === null) {
1052610526
return undefined;
1052710527
} else {
10528-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
10528+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
1052910529
}
1053010530
} else if ('value' in desc) {
1053110531
return desc.value;
@@ -10633,11 +10633,11 @@ return /******/ (function(modules) { // webpackBootstrap
1063310633
var _again = true;_function: while (_again) {
1063410634
var object = _x,
1063510635
property = _x2,
10636-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
10636+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
1063710637
var parent = Object.getPrototypeOf(object);if (parent === null) {
1063810638
return undefined;
1063910639
} else {
10640-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
10640+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
1064110641
}
1064210642
} else if ('value' in desc) {
1064310643
return desc.value;
@@ -11200,11 +11200,11 @@ return /******/ (function(modules) { // webpackBootstrap
1120011200
var _again = true;_function: while (_again) {
1120111201
var object = _x,
1120211202
property = _x2,
11203-
receiver = _x3;desc = parent = getter = undefined;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
11203+
receiver = _x3;_again = false;if (object === null) object = Function.prototype;var desc = Object.getOwnPropertyDescriptor(object, property);if (desc === undefined) {
1120411204
var parent = Object.getPrototypeOf(object);if (parent === null) {
1120511205
return undefined;
1120611206
} else {
11207-
_x = parent;_x2 = property;_x3 = receiver;_again = true;continue _function;
11207+
_x = parent;_x2 = property;_x3 = receiver;_again = true;desc = parent = undefined;continue _function;
1120811208
}
1120911209
} else if ("value" in desc) {
1121011210
return desc.value;

‎dist/design-system-react.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/design-system-react.min.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/design-system-react.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/SLDSButton/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
1515

1616
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
1717

18-
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
18+
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1919

2020
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
2121

‎lib/SLDSButtonGroup/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1313

1414
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
1515

16-
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
16+
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1717

1818
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
1919

‎lib/SLDSGrid/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
1515

1616
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
1717

18-
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
18+
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1919

2020
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
2121

‎lib/SLDSLookup/Menu/DefaultFooter/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
1313

14-
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
14+
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1515

1616
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
1717

0 commit comments

Comments
 (0)