This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 830
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add simple live share warning (#8066)
* add simple live share warning Signed-off-by: Kerry Archibald <[email protected]> * rough first cut of OwnBeaconStore Signed-off-by: Kerry Archibald <[email protected]> * working (?) has live beacons status Signed-off-by: Kerry Archibald <[email protected]> * lint Signed-off-by: Kerry Archibald <[email protected]> * add left panel share warning Signed-off-by: Kerry Archibald <[email protected]> * setup for tests Signed-off-by: Kerry Archibald <[email protected]> * test ownbeaconstore Signed-off-by: Kerry Archibald <[email protected]> * add copyright Signed-off-by: Kerry Archibald <[email protected]> * add copyright Signed-off-by: Kerry Archibald <[email protected]> * remove warning banner Signed-off-by: Kerry Archibald <[email protected]> * fix test Signed-off-by: Kerry Archibald <[email protected]> * fix tests for weird asyncstore closure issues Signed-off-by: Kerry Archibald <[email protected]> * fix OwnBeaconStore more... Signed-off-by: Kerry Archibald <[email protected]> * revert loose change to LeftPanel Signed-off-by: Kerry Archibald <[email protected]> * Revert "remove warning banner" This reverts commit 4529813. * test live share warning Signed-off-by: Kerry Archibald <[email protected]>
- Loading branch information
Kerry
authored
Mar 17, 2022
1 parent
59584cd
commit 9f6c238
Showing
9 changed files
with
221 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
res/css/components/views/beacon/_LeftPanelLiveShareWarning.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
.mx_LeftPanelLiveShareWarning { | ||
width: 100%; | ||
box-sizing: border-box; | ||
|
||
padding: $spacing-4; | ||
text-align: center; | ||
|
||
background-color: $accent; | ||
color: #fff; | ||
font-size: $font-10px; | ||
|
||
// panel backdrops overlay the whole sidepanel | ||
// go above to get hover for title | ||
z-index: 1; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import classNames from 'classnames'; | ||
import React from 'react'; | ||
|
||
import { useEventEmitterState } from '../../../hooks/useEventEmitter'; | ||
import { _t } from '../../../languageHandler'; | ||
import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../stores/OwnBeaconStore'; | ||
import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg'; | ||
|
||
interface Props { | ||
isMinimized?: boolean; | ||
} | ||
|
||
const LeftPanelLiveShareWarning: React.FC<Props> = ({ isMinimized }) => { | ||
const hasLiveBeacons = useEventEmitterState( | ||
OwnBeaconStore.instance, | ||
OwnBeaconStoreEvent.LivenessChange, | ||
() => OwnBeaconStore.instance.hasLiveBeacons(), | ||
); | ||
|
||
if (!hasLiveBeacons) { | ||
return null; | ||
} | ||
|
||
return <div | ||
className={classNames('mx_LeftPanelLiveShareWarning', { | ||
'mx_LeftPanelLiveShareWarning__minimized': isMinimized, | ||
})} | ||
title={isMinimized ? _t('You are sharing your live location') : undefined} | ||
> | ||
{ isMinimized ? <LiveLocationIcon height={10} /> : _t('You are sharing your live location') } | ||
</div>; | ||
}; | ||
|
||
export default LeftPanelLiveShareWarning; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import React from 'react'; | ||
import { mocked } from 'jest-mock'; | ||
import { mount } from 'enzyme'; | ||
|
||
import '../../../skinned-sdk'; | ||
import LeftPanelLiveShareWarning from '../../../../src/components/views/beacon/LeftPanelLiveShareWarning'; | ||
import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../../src/stores/OwnBeaconStore'; | ||
import { flushPromises } from '../../../test-utils'; | ||
|
||
jest.mock('../../../../src/stores/OwnBeaconStore', () => { | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
const EventEmitter = require("events"); | ||
class MockOwnBeaconStore extends EventEmitter { | ||
public hasLiveBeacons = jest.fn().mockReturnValue(false); | ||
} | ||
return { | ||
// @ts-ignore | ||
...jest.requireActual('../../../../src/stores/OwnBeaconStore'), | ||
OwnBeaconStore: { | ||
instance: new MockOwnBeaconStore() as unknown as OwnBeaconStore, | ||
}, | ||
}; | ||
}, | ||
); | ||
|
||
describe('<LeftPanelLiveShareWarning />', () => { | ||
const defaultProps = {}; | ||
const getComponent = (props = {}) => | ||
mount(<LeftPanelLiveShareWarning {...defaultProps} {...props} />); | ||
|
||
it('renders nothing when user has no live beacons', () => { | ||
const component = getComponent(); | ||
expect(component.html()).toBe(null); | ||
}); | ||
|
||
describe('when user has live beacons', () => { | ||
beforeEach(() => { | ||
mocked(OwnBeaconStore.instance).hasLiveBeacons.mockReturnValue(true); | ||
}); | ||
it('renders correctly when not minimized', () => { | ||
const component = getComponent(); | ||
expect(component).toMatchSnapshot(); | ||
}); | ||
|
||
it('renders correctly when minimized', () => { | ||
const component = getComponent({ isMinimized: true }); | ||
expect(component).toMatchSnapshot(); | ||
}); | ||
|
||
it('removes itself when user stops having live beacons', async () => { | ||
const component = getComponent({ isMinimized: true }); | ||
// started out rendered | ||
expect(component.html()).toBeTruthy(); | ||
|
||
mocked(OwnBeaconStore.instance).hasLiveBeacons.mockReturnValue(false); | ||
OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.LivenessChange, false); | ||
|
||
await flushPromises(); | ||
component.setProps({}); | ||
|
||
expect(component.html()).toBe(null); | ||
}); | ||
}); | ||
}); |
26 changes: 26 additions & 0 deletions
26
test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`<LeftPanelLiveShareWarning /> when user has live beacons renders correctly when minimized 1`] = ` | ||
<LeftPanelLiveShareWarning | ||
isMinimized={true} | ||
> | ||
<div | ||
className="mx_LeftPanelLiveShareWarning mx_LeftPanelLiveShareWarning__minimized" | ||
title="You are sharing your live location" | ||
> | ||
<div | ||
height={10} | ||
/> | ||
</div> | ||
</LeftPanelLiveShareWarning> | ||
`; | ||
|
||
exports[`<LeftPanelLiveShareWarning /> when user has live beacons renders correctly when not minimized 1`] = ` | ||
<LeftPanelLiveShareWarning> | ||
<div | ||
className="mx_LeftPanelLiveShareWarning" | ||
> | ||
You are sharing your live location | ||
</div> | ||
</LeftPanelLiveShareWarning> | ||
`; |