@@ -740,12 +740,12 @@ export default class AnnotationEditable extends React.Component<Props, State> {
740
740
this . props . isShared ? (
741
741
< span >
742
742
Disable Auto-Add
743
- < br /> Only added to Spaces you select
743
+ < br /> Only added to Spaces you manually select
744
744
</ span >
745
745
) : (
746
746
< span >
747
747
Enable Auto-Add
748
- < br /> Added to all Spaces the page is
748
+ < br /> Added to all Spaces the page is in
749
749
</ span >
750
750
)
751
751
}
@@ -952,7 +952,10 @@ export default class AnnotationEditable extends React.Component<Props, State> {
952
952
this . props . shareMenuAnnotationInstanceId ===
953
953
this . props . unifiedId ,
954
954
buttonRef : this . shareMenuButtonRef ,
955
- leftSideItem : this . renderAutoAddedIndicator ( ) ,
955
+ leftSideItem :
956
+ this . displayLists . length === 0
957
+ ? this . renderAutoAddedIndicator ( )
958
+ : null ,
956
959
showKeyShortcut : this . props . isInFocus && 'S' ,
957
960
} ,
958
961
{
@@ -1022,6 +1025,12 @@ export default class AnnotationEditable extends React.Component<Props, State> {
1022
1025
inFocus = { this . props . isInFocus }
1023
1026
inPageMode = { this . props . contextLocation === 'in-page' }
1024
1027
inEditMode = { isEditing || isEditingHighlight }
1028
+ isShown = {
1029
+ this . state . hoverCard ||
1030
+ this . props . isInFocus ||
1031
+ isEditing ||
1032
+ isEditingHighlight
1033
+ }
1025
1034
>
1026
1035
< ItemBoxBottom
1027
1036
borderTop = { false }
@@ -1072,7 +1081,12 @@ export default class AnnotationEditable extends React.Component<Props, State> {
1072
1081
inFocus = { this . props . isInFocus }
1073
1082
inPageMode = { this . props . contextLocation === 'in-page' }
1074
1083
inEditMode = { isEditing || isEditingHighlight }
1075
- isShown = { true }
1084
+ // isShown={
1085
+ // isEditing ||
1086
+ // isEditingHighlight ||
1087
+ // isDeleting ||
1088
+ // this.props.isInFocus
1089
+ // }
1076
1090
>
1077
1091
< ShareMenuContainer >
1078
1092
< PrimaryAction
@@ -1418,7 +1432,11 @@ export default class AnnotationEditable extends React.Component<Props, State> {
1418
1432
{ ( this . creationInfo ?. createdWhen &&
1419
1433
! this . props . isEditing ) ||
1420
1434
this . displayLists . length >= 1 ? (
1421
- < DateAndSpaces >
1435
+ < DateAndSpaces
1436
+ inSidebar = {
1437
+ this . props . contextLocation === 'in-page'
1438
+ }
1439
+ >
1422
1440
{ this . creationInfo ?. createdWhen &&
1423
1441
! this . props . isEditing && (
1424
1442
< CreationInfoBox >
@@ -1428,27 +1446,33 @@ export default class AnnotationEditable extends React.Component<Props, State> {
1428
1446
</ CreationInfoBox >
1429
1447
) }
1430
1448
{ this . displayLists . length >= 1 && (
1431
- < ListsSegment
1432
- tabIndex = { 0 }
1433
- lists = { this . displayLists }
1434
- onMouseEnter = {
1435
- this . props . onListsHover
1436
- }
1437
- onListClick = { this . props . onListClick }
1438
- onEditBtnClick = { ( ) => null }
1439
- spacePickerButtonRef = {
1440
- this . spacePickerBodyButtonRef
1441
- }
1442
- padding = {
1443
- this . props . isEditing
1444
- ? '0px'
1445
- : '0px'
1446
- }
1447
- removeSpaceForAnnotation = {
1448
- this . props
1449
- . removeSpaceFromEditorPicker
1450
- }
1451
- />
1449
+ < ListSegmentBox >
1450
+ { this . renderAutoAddedIndicator ( ) }
1451
+ < ListsSegment
1452
+ tabIndex = { 0 }
1453
+ lists = { this . displayLists }
1454
+ onMouseEnter = {
1455
+ this . props . onListsHover
1456
+ }
1457
+ onListClick = {
1458
+ this . props . onListClick
1459
+ }
1460
+ onEditBtnClick = { ( ) => null }
1461
+ spacePickerButtonRef = {
1462
+ this
1463
+ . spacePickerBodyButtonRef
1464
+ }
1465
+ padding = {
1466
+ this . props . isEditing
1467
+ ? '0px'
1468
+ : '0px'
1469
+ }
1470
+ removeSpaceForAnnotation = {
1471
+ this . props
1472
+ . removeSpaceFromEditorPicker
1473
+ }
1474
+ />
1475
+ </ ListSegmentBox >
1452
1476
) }
1453
1477
</ DateAndSpaces >
1454
1478
) : null }
@@ -1482,14 +1506,26 @@ export default class AnnotationEditable extends React.Component<Props, State> {
1482
1506
}
1483
1507
}
1484
1508
1485
- const DateAndSpaces = styled . div `
1509
+ const ListSegmentBox = styled . div `
1486
1510
display: flex;
1487
- justify-content: space-between;
1488
1511
align-items: center;
1512
+ justify-content: flex-start;
1513
+ width: 100%;
1514
+ grid-gap: 10px;
1515
+ /* padding: 0px 15px; */
1516
+ `
1517
+
1518
+ const DateAndSpaces = styled . div < {
1519
+ inSidebar : boolean
1520
+ } > `
1521
+ display: flex;
1522
+ justify-content: space-between;
1489
1523
width: 100%;
1490
- grid-gap: 20px;
1491
- padding: 5px 15px 10px 15px;
1492
1524
box-sizing: border-box;
1525
+ flex-direction: column-reverse;
1526
+ align-items: flex-start;
1527
+ padding: 10px 15px 10px 15px;
1528
+ grid-gap: 10px;
1493
1529
`
1494
1530
1495
1531
const DeleteScreenContainer = styled . div `
@@ -1709,11 +1745,14 @@ const DefaultFooterStyled = styled.div<{
1709
1745
props . inPageMode &&
1710
1746
css `
1711
1747
backdrop-filter: unset;
1712
- background: ${ ( props ) => props . theme . colors . black } ;
1748
+ background: transparent ;
1713
1749
` } ;
1714
1750
`
1715
1751
const ActionFooterStyled = styled ( DefaultFooterStyled ) `
1716
1752
padding: 0 0px 0px 0px;
1753
+ position: absolute;
1754
+ bottom: 0;
1755
+ background: ${ ( props ) => props . theme . colors . black0 } ;
1717
1756
`
1718
1757
1719
1758
const HighlightActionsBox = styled . div < { } > `
0 commit comments