Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 17 additions & 20 deletions src/components/BrowserCell/BrowserCell.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,32 +118,29 @@ export default class BrowserCell extends Component {
this.props.value[0].__type === 'Pointer' &&
typeof this.props.onPointerClick === 'function'
) {
const array = [];
this.props.value.map((v, i) => {
if (typeof v !== 'object' || v.__type !== 'Pointer') {
throw new Error('Invalid type found in pointer array');
const items = this.props.value.map((v, i) => {
if (!v || typeof v !== 'object' || v.__type !== 'Pointer') {
return <li key={`non-pointer-${i}`}><span>{JSON.stringify(v)}</span></li>;
}
const object = new Parse.Object(v.className);
object.id = v.objectId;
array.push(
<Pill
key={i}
value={v.objectId}
onClick={this.props.onPointerClick.bind(undefined, object)}
followClick={true}
shrinkablePill
/>
return (
<li key={`${v.objectId}-${i}`}>
<Pill
value={v.objectId}
onClick={this.props.onPointerClick.bind(undefined, object)}
onCmdClick={this.props.onPointerCmdClick ? this.props.onPointerCmdClick.bind(undefined, object) : undefined}
followClick={true}
shrinkablePill
/>
</li>
);
Comment thread
dblythy marked this conversation as resolved.
});
content = (
<ul className={styles.pointerList}>
{array.map((a, i) => (
<li key={i}>{a}</li>
))}
</ul>
);
// Set copyableValue to JSON string, not JSX (to avoid infinite render loop)
content = <ul className={styles.pointerList}>{items}</ul>;
this.copyableValue = JSON.stringify(this.props.value);
if (this.props.value.length > 1) {
classes.push(styles.hasMore);
}
} else {
this.copyableValue = content = JSON.stringify(this.props.value);
}
Expand Down
3 changes: 2 additions & 1 deletion src/components/Pill/Pill.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Icon from 'components/Icon/Icon.react';
const Pill = ({
value,
onClick,
onCmdClick,
fileDownloadLink,
followClick = false,
shrinkablePill = false,
Expand All @@ -29,7 +30,7 @@ const Pill = ({
{value}
</span>
{followClick && (
<a onClick={e => !e.metaKey && onClick()}>
<a onClick={e => { const handler = e.metaKey ? (onCmdClick || onClick) : onClick; if (typeof handler === 'function') { handler(); } }}>
<Icon name="right-outline" width={20} height={20} fill="#1669a1" />
</a>
)}
Expand Down
Loading