Skip to content

Commit 1dd8f4b

Browse files
committed
lookup modal prop build
1 parent d398f9d commit 1dd8f4b

File tree

8 files changed

+102
-22
lines changed

8 files changed

+102
-22
lines changed

dist/design-system-react.js

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

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: 5 additions & 5 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/SLDSDropdownBase/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ module.exports = _react2['default'].createClass({
251251
_SLDSPopover2['default'],
252252
{
253253
className: 'slds-dropdown slds-dropdown--left slds-dropdown--small slds-dropdown--menu',
254-
targetElement: this.refs.date,
254+
targetElement: this.refs.button,
255255
closeOnTabKey: true,
256256
onClose: this.handleCancel },
257257
this.getPopoverContent()

lib/SLDSLookup/Menu/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ var Menu = (function (_React$Component) {
9999
this.props.focusIndex === 0 ? isSearchRecordsActive = true : isSearchRecordsActive = false;
100100

101101
return _react2['default'].createElement(
102-
'div',
103-
{ className: 'ignore-react-onclickoutside slds-lookup__menu', role: 'listbox', ref: 'scroll' },
102+
'section',
103+
null,
104104
_react2['default'].createElement(
105105
'div',
106106
{ className: 'slds-lookup__item' },

lib/SLDSLookup/index.js

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ var _Menu = require('./Menu');
2727

2828
var _Menu2 = _interopRequireDefault(_Menu);
2929

30+
var _SLDSPopover = require('../SLDSPopover');
31+
32+
var _SLDSPopover2 = _interopRequireDefault(_SLDSPopover);
33+
3034
var _SLDSIcons = require("./../SLDSIcons");
3135

3236
var _SLDSButton = require('../SLDSButton');
@@ -149,6 +153,15 @@ var SLDSLookup = (function (_React$Component) {
149153
currentFocus: null
150154
});
151155
}
156+
}, {
157+
key: 'handleCancel',
158+
value: function handleCancel() {
159+
this.setState({
160+
isOpen: false,
161+
focusIndex: null,
162+
currentFocus: null
163+
});
164+
}
152165
}, {
153166
key: 'handleClick',
154167
value: function handleClick() {
@@ -219,9 +232,10 @@ var SLDSLookup = (function (_React$Component) {
219232
//=================================================
220233
// Rendering Things
221234
}, {
222-
key: 'renderMenu',
223-
value: function renderMenu() {
235+
key: 'renderMenuContent',
236+
value: function renderMenuContent() {
224237
if (this.state.isOpen) {
238+
225239
return _react2['default'].createElement(_Menu2['default'], {
226240
searchTerm: this.state.searchTerm,
227241
label: this.props.label,
@@ -238,6 +252,33 @@ var SLDSLookup = (function (_React$Component) {
238252
});
239253
}
240254
}
255+
}, {
256+
key: 'renderSimpleMenu',
257+
value: function renderSimpleMenu() {
258+
if (this.state.isOpen) {
259+
260+
return _react2['default'].createElement(
261+
'div',
262+
{ className: 'ignore-react-onclickoutside slds-lookup__menu', role: 'listbox', ref: 'scroll' },
263+
this.renderMenuContent()
264+
);
265+
}
266+
}
267+
}, {
268+
key: 'renderModalMenu',
269+
value: function renderModalMenu() {
270+
if (this.state.isOpen) {
271+
return _react2['default'].createElement(
272+
_SLDSPopover2['default'],
273+
{
274+
className: 'slds-dropdown slds-dropdown--left slds-dropdown--small slds-dropdown--menu',
275+
targetElement: this.refs.lookup,
276+
closeOnTabKey: true,
277+
onClose: this.handleCancel.bind(this) },
278+
this.renderMenuContent()
279+
);
280+
}
281+
}
241282
}, {
242283
key: 'renderSelectedItem',
243284
value: function renderSelectedItem() {
@@ -304,7 +345,7 @@ var SLDSLookup = (function (_React$Component) {
304345
value: this.state.searchTerm
305346
})
306347
),
307-
this.renderMenu()
348+
this.props.modal ? this.renderModalMenu() : this.renderSimpleMenu()
308349
)
309350
);
310351
}
@@ -320,11 +361,15 @@ SLDSLookup.propTypes = {
320361
filterWith: _react2['default'].PropTypes.func,
321362
onItemSelect: _react2['default'].PropTypes.func,
322363
onNewItem: _react2['default'].PropTypes.func,
323-
onSearchRecords: _react2['default'].PropTypes.func
364+
onSearchRecords: _react2['default'].PropTypes.func,
365+
modal: _react2['default'].PropTypes.boolean,
366+
disabled: _react2['default'].PropTypes.boolean
324367
};
325368

326369
SLDSLookup.defaultProps = {
327370
filterWith: defaultFilter,
371+
modal: false,
372+
disabled: false,
328373
onItemSelect: function onItemSelect(item) {
329374
//console.log('onItemSelect should be defined');
330375
}

lib/SLDSPicklistBase/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ module.exports = _react2['default'].createClass({
188188
'div',
189189
{
190190
className: 'slds-dropdown slds-dropdown--left slds-dropdown--small slds-dropdown--menu',
191-
targetElement: this.refs.button,
192191
style: { maxHeight: '20em' } },
193192
this.getPopoverContent()
194193
) : null;

0 commit comments

Comments
 (0)