Skip to content

🚀 [Story share] Move share menu to separate bundle #37179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mszylkowski merged 13 commits into from
Dec 13, 2021
Merged

🚀 [Story share] Move share menu to separate bundle #37179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
34674a2
Started to move share menu to bundle
mszylkowski Dec 10, 2021
ee125c3
Install amp-social-share only on desktop
mszylkowski Dec 10, 2021
539cb5a
Fixed CSS import
mszylkowski Dec 10, 2021
6eafb57
Fixed test
mszylkowski Dec 10, 2021
5614698
Fixed CSS import
mszylkowski Dec 10, 2021
31848a4
Merge branch 'main' of github.com:ampproject/amphtml into removeShare…
mszylkowski Dec 10, 2021
2348b9a
Cleaned
mszylkowski Dec 13, 2021
4c2a234
Fix tets
mszylkowski Dec 13, 2021
89d197b
Removed console.log, new test
mszylkowski Dec 13, 2021
33ec624
Removed unused import in test
mszylkowski Dec 13, 2021
3297586
Removed unused import
mszylkowski Dec 13, 2021
331cc1f
Fixed dependency checks
mszylkowski Dec 13, 2021
763df89
Fixed zindeex
mszylkowski Dec 13, 2021
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
Prev Previous commit
Next Next commit
Cleaned
  • Loading branch information
@mszylkowski
mszylkowski committed Dec 13, 2021
commit 2348b9a3cfbc1e2a0d57cfde6cbdf1d955171128
22 changes: 3 additions & 19 deletions extensions/amp-story-share-menu/0.1/amp-story-share-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,6 @@ const renderForFallbackSharing = (element, close, children) => {
);
};

/**
* System amp-social-share button template.
* @return {!Element}
*/
const renderAmpSocialShareSystemElement = () => {
return (
<amp-social-share
type="system"
// TODO(alanorozco): This style attr would be nicer as an object.
// We need to enable babel-plugin-jsx-style-object in the testing config
// so that we can verify results of style objects.
style="visibility:hidden;pointer-events:none;z-index:-1"
></amp-social-share>
);
};

/**
* Share menu UI.
*/
Expand Down Expand Up @@ -147,8 +131,7 @@ export class ShareMenu {
* @return {!Element}
*/
buildForSystemSharing_() {
this.element_ = renderAmpSocialShareSystemElement();
return this.element_;
return (this.element_ = <div></div>);
}

/**
Expand Down Expand Up @@ -228,7 +211,8 @@ export class ShareMenu {
this.element_.setAttribute('aria-hidden', !isOpen);
});
}
this.element_[ANALYTICS_TAG_NAME] = 'amp-story-share-menu';

this.element_[ANALYTICS_TAG_NAME] = TAG;
this.analyticsService_.triggerEvent(
isOpen ? StoryAnalyticsEvent.OPEN : StoryAnalyticsEvent.CLOSE,
this.element_
Expand Down
16 changes: 4 additions & 12 deletions extensions/amp-story/1.0/amp-story-share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {isObject} from '#core/types';
* @const {!Object<string, !LocalizedStringId_Enum>}
*/
const SHARE_PROVIDER_LOCALIZED_STRING_ID = map({
'system': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_SYSTEM,
'email': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_EMAIL,
'facebook': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_FACEBOOK,
'line': LocalizedStringId_Enum.AMP_STORY_SHARING_PROVIDER_NAME_LINE,
Expand Down Expand Up @@ -96,6 +95,10 @@ function buildProvider(doc, shareType) {
SHARE_PROVIDER_LOCALIZED_STRING_ID[shareType];

if (!shareProviderLocalizedStringId) {
user().warn(
'AMP-STORY',
`'${shareType}'is not a valid share provider type.`
);
return null;
}

Expand Down Expand Up @@ -170,7 +173,6 @@ export class ShareWidget {
<div class="i-amphtml-story-share-widget">
<ul class="i-amphtml-story-share-list">
{this.maybeRenderLinkShareButton_()}
<li></li>
</ul>
</div>
);
Expand Down Expand Up @@ -272,16 +274,6 @@ export class ShareWidget {
delete params['provider'];
}

if (provider == 'system') {
user().warn(
'AMP-STORY',
'`system` is not a valid share provider type. Native sharing is ' +
'enabled by default and cannot be turned off.',
provider
);
return;
}

const element = buildProvider(
this.win.document,
/** @type {string} */ (provider)
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-story/1.0/story-analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export class StoryAnalyticsService {

/**
* @param {!StoryAnalyticsEvent} eventType
* @param {Element=} element
* @param {Element|Object=} element
*/
triggerEvent(eventType, element = null) {
this.incrementPageEventCount_(eventType);
Expand All @@ -133,7 +133,7 @@ export class StoryAnalyticsService {
/**
* Updates event details.
* @param {!StoryAnalyticsEvent} eventType
* @param {Element=} element
* @param {Element|Object=} element
* @visibleForTesting
* @return {!JsonObject}}
*/
Expand Down